From cd7b597a7f96c0c71d7f7be6f418aac7dcd1f9e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Kera=CC=88nen?= Date: Fri, 1 Jun 2018 08:26:41 +0300 Subject: [PATCH] Cleanup: Big renaming of prefixes Renamed libcore's LIBDENG2 => LIBCORE. All DENG and DENG2 prefixed variables and definitions are now simply DE prefixed. --- .travis.yml | 2 +- appveyor.yml | 2 +- doomsday/CMakeLists.txt | 2 +- doomsday/apps/CMakeLists.txt | 4 +- doomsday/apps/api/api_audiod.h | 6 +- doomsday/apps/api/api_base.h | 8 +- doomsday/apps/api/api_busy.h | 8 +- doomsday/apps/api/api_client.h | 8 +- doomsday/apps/api/api_console.h | 8 +- doomsday/apps/api/api_def.h | 8 +- doomsday/apps/api/api_event.h | 8 +- doomsday/apps/api/api_filesys.h | 8 +- doomsday/apps/api/api_fontrender.h | 14 +- doomsday/apps/api/api_gl.h | 8 +- doomsday/apps/api/api_infine.h | 8 +- doomsday/apps/api/api_internaldata.h | 6 +- doomsday/apps/api/api_map.h | 12 +- doomsday/apps/api/api_mapedit.h | 8 +- doomsday/apps/api/api_material.h | 8 +- doomsday/apps/api/api_player.h | 8 +- doomsday/apps/api/api_render.h | 8 +- doomsday/apps/api/api_resource.h | 8 +- doomsday/apps/api/api_server.h | 8 +- doomsday/apps/api/api_sound.h | 8 +- doomsday/apps/api/api_svg.h | 8 +- doomsday/apps/api/api_thinker.h | 14 +- doomsday/apps/api/api_uri.h | 14 +- doomsday/apps/api/apis.h | 20 +- doomsday/apps/api/dd_share.h | 6 +- doomsday/apps/api/dd_version.h.in | 19 +- doomsday/apps/api/def_share.h | 6 +- doomsday/apps/client/CMakeLists.txt | 32 +-- doomsday/apps/client/client-mac.doxy | 12 +- doomsday/apps/client/client-win32.doxy | 14 +- .../apps/client/doomsday-engine.desktop.in | 3 +- .../apps/client/include/audio/audiodriver.h | 4 +- .../apps/client/include/audio/audiosystem.h | 2 +- doomsday/apps/client/include/audio/s_cache.h | 4 +- .../apps/client/include/audio/s_environ.h | 6 +- .../apps/client/include/audio/sfxchannel.h | 6 +- .../client/include/audio/sys_audiod_dummy.h | 8 +- .../include/audio/sys_audiod_sdlmixer.h | 6 +- doomsday/apps/client/include/busyrunner.h | 4 +- doomsday/apps/client/include/client/cl_def.h | 18 +- .../apps/client/include/client/cl_frame.h | 6 +- doomsday/apps/client/include/client/cl_mobj.h | 8 +- .../apps/client/include/client/cl_player.h | 10 +- .../apps/client/include/client/cl_sound.h | 6 +- .../apps/client/include/client/cl_world.h | 6 +- .../apps/client/include/client/cledgeloop.h | 8 +- .../client/include/client/clientsubsector.h | 8 +- .../apps/client/include/client/clplanemover.h | 6 +- .../apps/client/include/client/clpolymover.h | 6 +- .../apps/client/include/client/clskyplane.h | 10 +- doomsday/apps/client/include/clientapp.h | 10 +- doomsday/apps/client/include/clientplayer.h | 2 +- doomsday/apps/client/include/con_config.h | 6 +- doomsday/apps/client/include/configprofiles.h | 10 +- doomsday/apps/client/include/dd_def.h | 4 +- doomsday/apps/client/include/dd_loop.h | 8 +- doomsday/apps/client/include/dd_main.h | 10 +- doomsday/apps/client/include/dd_pinit.h | 6 +- doomsday/apps/client/include/de_base.h | 6 +- doomsday/apps/client/include/de_platform.h | 2 +- doomsday/apps/client/include/def_main.h | 2 +- doomsday/apps/client/include/edit_map.h | 6 +- doomsday/apps/client/include/gl/gl_defer.h | 24 +- .../apps/client/include/gl/gl_deferredapi.h | 12 +- doomsday/apps/client/include/gl/gl_draw.h | 6 +- doomsday/apps/client/include/gl/gl_main.h | 18 +- doomsday/apps/client/include/gl/gl_tex.h | 6 +- .../apps/client/include/gl/gl_texmanager.h | 6 +- .../apps/client/include/gl/gltextureunit.h | 6 +- doomsday/apps/client/include/gl/svg.h | 6 +- doomsday/apps/client/include/gl/sys_opengl.h | 6 +- .../apps/client/include/gl/texturecontent.h | 6 +- doomsday/apps/client/include/localplayer.h | 2 +- .../apps/client/include/macx/cursor_macx.h | 2 +- doomsday/apps/client/include/misc/color.h | 6 +- doomsday/apps/client/include/misc/face.h | 8 +- doomsday/apps/client/include/misc/hedge.h | 12 +- doomsday/apps/client/include/misc/ihplane.h | 8 +- doomsday/apps/client/include/misc/mesh.h | 8 +- doomsday/apps/client/include/misc/r_util.h | 6 +- .../client/include/network/masterserver.h | 8 +- .../apps/client/include/network/monitor.h | 6 +- .../apps/client/include/network/net_buf.h | 6 +- .../apps/client/include/network/net_demo.h | 6 +- .../apps/client/include/network/net_main.h | 6 +- .../apps/client/include/network/net_msg.h | 4 +- .../apps/client/include/network/protocol.h | 6 +- .../apps/client/include/network/serverlink.h | 12 +- .../apps/client/include/render/angleclipper.h | 4 +- .../apps/client/include/render/billboard.h | 20 +- .../client/include/render/blockmapvisual.h | 12 +- .../apps/client/include/render/cameralensfx.h | 6 +- .../client/include/render/consoleeffect.h | 8 +- .../apps/client/include/render/decoration.h | 10 +- .../apps/client/include/render/drawlist.h | 6 +- .../apps/client/include/render/drawlists.h | 8 +- doomsday/apps/client/include/render/environ.h | 8 +- .../apps/client/include/render/fx/bloom.h | 8 +- .../client/include/render/fx/colorfilter.h | 6 +- .../client/include/render/fx/lensflares.h | 8 +- .../apps/client/include/render/fx/vignette.h | 6 +- .../apps/client/include/render/ilightsource.h | 6 +- .../client/include/render/lightdecoration.h | 6 +- doomsday/apps/client/include/render/lumobj.h | 8 +- doomsday/apps/client/include/render/model.h | 6 +- .../apps/client/include/render/modelloader.h | 14 +- .../client/include/render/modelrenderer.h | 8 +- .../include/render/playerweaponanimator.h | 2 +- .../client/include/render/projectionlist.h | 6 +- doomsday/apps/client/include/render/r_draw.h | 6 +- doomsday/apps/client/include/render/r_main.h | 20 +- .../apps/client/include/render/r_things.h | 6 +- .../client/include/render/rend_fakeradio.h | 10 +- .../apps/client/include/render/rend_font.h | 6 +- .../apps/client/include/render/rend_halo.h | 12 +- .../apps/client/include/render/rend_main.h | 136 +++++----- .../apps/client/include/render/rend_model.h | 20 +- .../client/include/render/rend_particle.h | 8 +- .../apps/client/include/render/rendersystem.h | 2 +- .../apps/client/include/render/rendpoly.h | 8 +- .../apps/client/include/render/shadervar.h | 8 +- .../apps/client/include/render/shadowedge.h | 2 +- .../apps/client/include/render/skydrawable.h | 14 +- .../apps/client/include/render/skyfixedge.h | 10 +- .../client/include/render/stateanimator.h | 10 +- doomsday/apps/client/include/render/store.h | 6 +- .../include/render/trianglestripbuilder.h | 8 +- .../client/include/render/vectorlightlist.h | 6 +- .../apps/client/include/render/viewports.h | 10 +- .../apps/client/include/render/vissprite.h | 12 +- .../apps/client/include/render/walledge.h | 6 +- .../apps/client/include/render/wallspec.h | 6 +- .../client/include/resource/abstractfont.h | 4 +- .../apps/client/include/resource/bitmapfont.h | 2 +- .../client/include/resource/clientmaterial.h | 18 +- .../client/include/resource/clientresources.h | 14 +- .../client/include/resource/clienttexture.h | 10 +- .../include/resource/compositebitmapfont.h | 2 +- .../client/include/resource/fontmanifest.h | 14 +- .../apps/client/include/resource/fontscheme.h | 16 +- .../apps/client/include/resource/framemodel.h | 14 +- .../client/include/resource/framemodeldef.h | 14 +- doomsday/apps/client/include/resource/hq2x.h | 6 +- doomsday/apps/client/include/resource/image.h | 6 +- .../include/resource/materialanimator.h | 10 +- .../apps/client/include/resource/rawtexture.h | 6 +- .../include/resource/texturevariantspec.h | 6 +- doomsday/apps/client/include/sdlnet_dummy.h | 4 +- doomsday/apps/client/include/sys_system.h | 8 +- doomsday/apps/client/include/ui/alertmask.h | 8 +- .../apps/client/include/ui/axisinputcontrol.h | 2 +- doomsday/apps/client/include/ui/bindcontext.h | 8 +- doomsday/apps/client/include/ui/binding.h | 2 +- doomsday/apps/client/include/ui/busyvisual.h | 6 +- .../apps/client/include/ui/clientrootwidget.h | 8 +- doomsday/apps/client/include/ui/clientstyle.h | 8 +- .../apps/client/include/ui/clientwindow.h | 10 +- .../client/include/ui/clientwindowsystem.h | 8 +- .../client/include/ui/controllerpresets.h | 8 +- .../client/include/ui/dialogs/aboutdialog.h | 8 +- .../client/include/ui/dialogs/alertdialog.h | 8 +- .../include/ui/dialogs/audiosettingsdialog.h | 8 +- .../ui/dialogs/coloradjustmentdialog.h | 8 +- .../include/ui/dialogs/createprofiledialog.h | 8 +- .../ui/dialogs/datafilesettingsdialog.h | 8 +- .../include/ui/dialogs/downloaddialog.h | 8 +- .../include/ui/dialogs/filedownloaddialog.h | 8 +- .../include/ui/dialogs/inputsettingsdialog.h | 8 +- .../include/ui/dialogs/logsettingsdialog.h | 8 +- .../ui/dialogs/manualconnectiondialog.h | 8 +- .../ui/dialogs/networksettingsdialog.h | 8 +- .../ui/dialogs/packagecompatibilitydialog.h | 8 +- .../include/ui/dialogs/packageinfodialog.h | 8 +- .../include/ui/dialogs/packagesdialog.h | 8 +- .../ui/dialogs/renderersettingsdialog.h | 8 +- .../ui/dialogs/repositorybrowserdialog.h | 8 +- .../include/ui/dialogs/serverinfodialog.h | 8 +- .../include/ui/dialogs/uisettingsdialog.h | 8 +- .../include/ui/dialogs/videosettingsdialog.h | 10 +- .../include/ui/dialogs/vrsettingsdialog.h | 8 +- .../include/ui/editors/modelasseteditor.h | 8 +- .../ui/editors/rendererappearanceeditor.h | 8 +- .../include/ui/editors/variablegroupeditor.h | 8 +- .../client/include/ui/home/columnwidget.h | 8 +- .../client/include/ui/home/gamecolumnwidget.h | 8 +- .../include/ui/home/gamepanelbuttonwidget.h | 8 +- .../client/include/ui/home/headerwidget.h | 8 +- .../apps/client/include/ui/home/homewidget.h | 8 +- .../include/ui/home/multiplayercolumnwidget.h | 8 +- .../ui/home/multiplayerpanelbuttonwidget.h | 10 +- .../include/ui/home/nogamescolumnwidget.h | 6 +- .../include/ui/home/packagescolumnwidget.h | 8 +- .../client/include/ui/home/savelistwidget.h | 8 +- .../apps/client/include/ui/infine/finale.h | 10 +- .../include/ui/infine/finaleanimwidget.h | 8 +- .../include/ui/infine/finaleinterpreter.h | 12 +- .../include/ui/infine/finalepagewidget.h | 12 +- .../include/ui/infine/finaletextwidget.h | 8 +- .../client/include/ui/infine/finalewidget.h | 12 +- .../client/include/ui/infine/infinesystem.h | 10 +- doomsday/apps/client/include/ui/inputdebug.h | 4 +- doomsday/apps/client/include/ui/inputdevice.h | 12 +- doomsday/apps/client/include/ui/inputsystem.h | 6 +- doomsday/apps/client/include/ui/joystick.h | 6 +- doomsday/apps/client/include/ui/nativemenu.h | 8 +- doomsday/apps/client/include/ui/nativeui.h | 6 +- .../apps/client/include/ui/postprocessing.h | 8 +- doomsday/apps/client/include/ui/progress.h | 6 +- .../apps/client/include/ui/savelistdata.h | 10 +- .../include/ui/styledlogsinkformatter.h | 8 +- doomsday/apps/client/include/ui/sys_input.h | 4 +- doomsday/apps/client/include/ui/ui_main.h | 6 +- .../apps/client/include/ui/viewcompositor.h | 8 +- .../client/include/ui/widgets/busywidget.h | 2 +- .../include/ui/widgets/consolecommandwidget.h | 8 +- .../client/include/ui/widgets/consolewidget.h | 10 +- .../include/ui/widgets/cvarchoicewidget.h | 8 +- .../include/ui/widgets/cvarlineeditwidget.h | 8 +- .../include/ui/widgets/cvarnativepathwidget.h | 8 +- .../include/ui/widgets/cvarsliderwidget.h | 8 +- .../include/ui/widgets/cvartogglewidget.h | 8 +- .../client/include/ui/widgets/gamewidget.h | 2 +- .../include/ui/widgets/homeitemwidget.h | 8 +- .../include/ui/widgets/homemenuwidget.h | 8 +- .../client/include/ui/widgets/icvarwidget.h | 6 +- .../include/ui/widgets/inputbindingwidget.h | 8 +- .../include/ui/widgets/keygrabberwidget.h | 8 +- .../include/ui/widgets/mapoutlinewidget.h | 8 +- .../ui/widgets/multiplayerservermenuwidget.h | 10 +- .../ui/widgets/multiplayerstatuswidget.h | 8 +- .../ui/widgets/packagecontentoptionswidget.h | 8 +- .../include/ui/widgets/packagesbuttonwidget.h | 8 +- .../ui/widgets/packagessidebarwidget.h | 8 +- .../include/ui/widgets/packageswidget.h | 10 +- .../include/ui/widgets/panelbuttonwidget.h | 8 +- .../include/ui/widgets/privilegedlogwidget.h | 2 +- .../include/ui/widgets/profilepickerwidget.h | 8 +- .../client/include/ui/widgets/sidebarwidget.h | 8 +- .../client/include/ui/widgets/taskbarwidget.h | 10 +- .../include/ui/widgets/tutorialwidget.h | 8 +- doomsday/apps/client/include/ui/zonedebug.h | 4 +- doomsday/apps/client/include/unix/dd_uinit.h | 6 +- doomsday/apps/client/include/updater.h | 8 +- .../include/updater/processcheckdialog.h | 6 +- .../include/updater/updateavailabledialog.h | 8 +- .../include/updater/updatedownloaddialog.h | 8 +- .../client/include/updater/updatersettings.h | 6 +- .../include/updater/updatersettingsdialog.h | 8 +- .../apps/client/include/windows/dd_winit.h | 6 +- .../apps/client/include/windows/directinput.h | 6 +- .../apps/client/include/windows/mouse_win32.h | 6 +- .../client/include/world/audioenvironment.h | 6 +- .../client/include/world/bindings_world.h | 9 +- doomsday/apps/client/include/world/blockmap.h | 8 +- .../include/world/bsp/convexsubspaceproxy.h | 10 +- .../apps/client/include/world/bsp/edgetip.h | 10 +- .../apps/client/include/world/bsp/hplane.h | 12 +- .../client/include/world/bsp/linesegment.h | 26 +- .../client/include/world/bsp/partitioner.h | 10 +- .../include/world/bsp/partitionevaluator.h | 8 +- .../client/include/world/bsp/superblockmap.h | 8 +- doomsday/apps/client/include/world/bspleaf.h | 8 +- .../include/world/clientmobjthinkerdata.h | 8 +- .../client/include/world/clientserverworld.h | 12 +- doomsday/apps/client/include/world/contact.h | 8 +- .../client/include/world/contactspreader.h | 6 +- .../client/include/world/convexsubspace.h | 18 +- .../client/include/world/impulseaccumulator.h | 2 +- .../apps/client/include/world/interceptor.h | 8 +- doomsday/apps/client/include/world/line.h | 34 +-- .../apps/client/include/world/lineblockmap.h | 6 +- .../apps/client/include/world/lineowner.h | 6 +- .../apps/client/include/world/linesighttest.h | 8 +- doomsday/apps/client/include/world/map.h | 37 +-- .../apps/client/include/world/mapobject.h | 16 +- doomsday/apps/client/include/world/p_object.h | 2 +- .../apps/client/include/world/p_players.h | 6 +- doomsday/apps/client/include/world/p_ticker.h | 6 +- doomsday/apps/client/include/world/plane.h | 20 +- doomsday/apps/client/include/world/polyobj.h | 8 +- .../apps/client/include/world/polyobjdata.h | 6 +- doomsday/apps/client/include/world/reject.h | 6 +- doomsday/apps/client/include/world/sector.h | 22 +- doomsday/apps/client/include/world/sky.h | 24 +- .../apps/client/include/world/subsector.h | 14 +- doomsday/apps/client/include/world/surface.h | 26 +- doomsday/apps/client/include/world/thinkers.h | 4 +- doomsday/apps/client/include/world/vertex.h | 12 +- .../renderer.pack/shaders/dgl/dgl_draw.fsh | 6 +- .../renderer.pack/shaders/dgl/dgl_draw.vsh | 14 +- .../shaders/include/lighting.glsl | 10 +- .../shaders/include/reflection.glsl | 2 +- .../shaders/include/tangentspace.glsl | 8 +- .../shaders/include/texture.glsl | 2 +- .../renderer.pack/shaders/ui.dei | 6 +- doomsday/apps/client/src/api_console.cpp | 4 +- doomsday/apps/client/src/api_filesys.cpp | 8 +- doomsday/apps/client/src/api_map.cpp | 134 +++++----- doomsday/apps/client/src/api_mapedit.cpp | 6 +- doomsday/apps/client/src/api_uri.cpp | 32 +-- .../apps/client/src/audio/audiodriver.cpp | 22 +- .../client/src/audio/base/audiosystem.cpp | 60 ++--- .../apps/client/src/audio/base/s_cache.cpp | 16 +- doomsday/apps/client/src/audio/s_environ.cpp | 4 +- doomsday/apps/client/src/audio/sfxchannel.cpp | 12 +- .../client/src/audio/sys_audiod_dummy.cpp | 8 +- .../client/src/audio/sys_audiod_sdlmixer.cpp | 4 +- doomsday/apps/client/src/busyrunner.cpp | 30 +-- doomsday/apps/client/src/client/cl_main.cpp | 12 +- doomsday/apps/client/src/client/cl_mobj.cpp | 12 +- doomsday/apps/client/src/client/cl_player.cpp | 8 +- doomsday/apps/client/src/client/cl_sound.cpp | 2 +- doomsday/apps/client/src/client/cl_world.cpp | 4 +- .../apps/client/src/client/cledgeloop.cpp | 14 +- .../client/src/client/clientsubsector.cpp | 70 ++--- .../apps/client/src/client/clplanemover.cpp | 2 +- .../apps/client/src/client/clskyplane.cpp | 8 +- doomsday/apps/client/src/clientapp.cpp | 70 ++--- doomsday/apps/client/src/clientplayer.cpp | 4 +- doomsday/apps/client/src/con_config.cpp | 14 +- doomsday/apps/client/src/configprofiles.cpp | 30 +-- doomsday/apps/client/src/dd_loop.cpp | 6 +- doomsday/apps/client/src/dd_main.cpp | 104 ++++---- doomsday/apps/client/src/dd_pinit.cpp | 4 +- doomsday/apps/client/src/def_main.cpp | 54 ++-- doomsday/apps/client/src/gl/dgl_common.cpp | 178 ++++++------- doomsday/apps/client/src/gl/dgl_draw.cpp | 128 ++++----- doomsday/apps/client/src/gl/gl_defer.cpp | 40 +-- .../apps/client/src/gl/gl_deferredapi.cpp | 8 +- doomsday/apps/client/src/gl/gl_draw.cpp | 34 +-- .../client/src/gl/gl_drawvectorgraphic.cpp | 18 +- doomsday/apps/client/src/gl/gl_main.cpp | 96 +++---- doomsday/apps/client/src/gl/gl_tex.cpp | 38 +-- doomsday/apps/client/src/gl/gl_texmanager.cpp | 10 +- doomsday/apps/client/src/gl/svg.cpp | 6 +- doomsday/apps/client/src/gl/sys_opengl.cpp | 22 +- .../apps/client/src/gl/texturecontent.cpp | 40 +-- doomsday/apps/client/src/localplayer.cpp | 2 +- doomsday/apps/client/src/macx/cursor_macx.mm | 2 +- doomsday/apps/client/src/main_client.cpp | 28 +- doomsday/apps/client/src/misc/color.cpp | 4 +- doomsday/apps/client/src/misc/face.cpp | 2 +- doomsday/apps/client/src/misc/hedge.cpp | 2 +- doomsday/apps/client/src/misc/mesh.cpp | 4 +- doomsday/apps/client/src/misc/r_util.cpp | 6 +- .../client/src/network/base/masterserver.cpp | 10 +- .../apps/client/src/network/base/monitor.cpp | 2 +- .../apps/client/src/network/base/net_buf.cpp | 8 +- .../client/src/network/base/net_event.cpp | 16 +- .../apps/client/src/network/base/net_main.cpp | 64 ++--- .../apps/client/src/network/base/net_msg.cpp | 6 +- .../apps/client/src/network/base/net_ping.cpp | 8 +- doomsday/apps/client/src/network/net_demo.cpp | 26 +- .../apps/client/src/network/serverlink.cpp | 40 +-- .../apps/client/src/render/angleclipper.cpp | 36 +-- .../apps/client/src/render/api_render.cpp | 52 ++-- doomsday/apps/client/src/render/billboard.cpp | 16 +- .../apps/client/src/render/blockmapvisual.cpp | 18 +- .../apps/client/src/render/consoleeffect.cpp | 2 +- .../apps/client/src/render/decoration.cpp | 6 +- doomsday/apps/client/src/render/drawlist.cpp | 58 ++-- doomsday/apps/client/src/render/drawlists.cpp | 4 +- doomsday/apps/client/src/render/environ.cpp | 10 +- doomsday/apps/client/src/render/fx/bloom.cpp | 2 +- .../apps/client/src/render/fx/colorfilter.cpp | 4 +- .../apps/client/src/render/fx/lensflares.cpp | 18 +- .../client/src/render/lightdecoration.cpp | 2 +- doomsday/apps/client/src/render/lumobj.cpp | 4 +- .../apps/client/src/render/modelloader.cpp | 46 ++-- .../apps/client/src/render/modelrenderer.cpp | 14 +- .../src/render/playerweaponanimator.cpp | 8 +- doomsday/apps/client/src/render/r_draw.cpp | 14 +- doomsday/apps/client/src/render/r_main.cpp | 6 +- doomsday/apps/client/src/render/r_things.cpp | 6 +- .../apps/client/src/render/rend_fakeradio.cpp | 26 +- doomsday/apps/client/src/render/rend_font.cpp | 17 +- doomsday/apps/client/src/render/rend_halo.cpp | 10 +- doomsday/apps/client/src/render/rend_main.cpp | 146 +++++------ .../apps/client/src/render/rend_model.cpp | 58 ++-- .../apps/client/src/render/rend_particle.cpp | 14 +- .../apps/client/src/render/rendersystem.cpp | 14 +- .../apps/client/src/render/shadowedge.cpp | 2 +- .../apps/client/src/render/skydrawable.cpp | 24 +- .../apps/client/src/render/skyfixedge.cpp | 10 +- .../apps/client/src/render/stateanimator.cpp | 12 +- .../src/render/trianglestripbuilder.cpp | 2 +- doomsday/apps/client/src/render/viewports.cpp | 78 +++--- doomsday/apps/client/src/render/vissprite.cpp | 2 +- doomsday/apps/client/src/render/vr.cpp | 8 +- doomsday/apps/client/src/render/walledge.cpp | 14 +- .../apps/client/src/resource/abstractfont.cpp | 2 +- .../client/src/resource/base/api_material.cpp | 12 +- .../client/src/resource/base/api_resource.cpp | 40 +-- .../apps/client/src/resource/bitmapfont.cpp | 10 +- .../client/src/resource/clientmaterial.cpp | 10 +- .../client/src/resource/clientresources.cpp | 54 ++-- .../client/src/resource/clienttexture.cpp | 10 +- .../src/resource/compositebitmapfont.cpp | 2 +- .../apps/client/src/resource/fontmanifest.cpp | 8 +- .../apps/client/src/resource/fontscheme.cpp | 22 +- .../apps/client/src/resource/framemodel.cpp | 2 +- doomsday/apps/client/src/resource/image.cpp | 12 +- .../client/src/resource/materialanimator.cpp | 14 +- .../client/src/resource/texturevariant.cpp | 8 +- doomsday/apps/client/src/sys_system.cpp | 12 +- doomsday/apps/client/src/ui/alertmask.cpp | 4 +- .../apps/client/src/ui/axisinputcontrol.cpp | 46 ++-- doomsday/apps/client/src/ui/b_util.cpp | 40 +-- doomsday/apps/client/src/ui/bindcontext.cpp | 34 +-- doomsday/apps/client/src/ui/binding.cpp | 4 +- doomsday/apps/client/src/ui/busyvisual.cpp | 6 +- .../apps/client/src/ui/clientrootwidget.cpp | 2 +- doomsday/apps/client/src/ui/clientstyle.cpp | 2 +- doomsday/apps/client/src/ui/clientwindow.cpp | 76 +++--- .../apps/client/src/ui/clientwindowsystem.cpp | 2 +- .../apps/client/src/ui/commandbinding.cpp | 22 +- .../apps/client/src/ui/controllerpresets.cpp | 6 +- .../client/src/ui/dialogs/aboutdialog.cpp | 2 +- .../client/src/ui/dialogs/alertdialog.cpp | 14 +- .../src/ui/dialogs/audiosettingsdialog.cpp | 6 +- .../src/ui/dialogs/coloradjustmentdialog.cpp | 2 +- .../src/ui/dialogs/createprofiledialog.cpp | 2 +- .../src/ui/dialogs/datafilesettingsdialog.cpp | 2 +- .../client/src/ui/dialogs/downloaddialog.cpp | 2 +- .../src/ui/dialogs/filedownloaddialog.cpp | 10 +- .../src/ui/dialogs/inputsettingsdialog.cpp | 2 +- .../src/ui/dialogs/logsettingsdialog.cpp | 4 +- .../src/ui/dialogs/manualconnectiondialog.cpp | 6 +- .../src/ui/dialogs/networksettingsdialog.cpp | 2 +- .../ui/dialogs/packagecompatibilitydialog.cpp | 4 +- .../src/ui/dialogs/packageinfodialog.cpp | 3 +- .../client/src/ui/dialogs/packagesdialog.cpp | 6 +- .../src/ui/dialogs/renderersettingsdialog.cpp | 2 +- .../ui/dialogs/repositorybrowserdialog.cpp | 12 +- .../src/ui/dialogs/serverinfodialog.cpp | 14 +- .../src/ui/dialogs/uisettingsdialog.cpp | 2 +- .../src/ui/dialogs/videosettingsdialog.cpp | 20 +- .../src/ui/dialogs/vrsettingsdialog.cpp | 4 +- .../src/ui/editors/modelasseteditor.cpp | 6 +- .../ui/editors/rendererappearanceeditor.cpp | 4 +- .../src/ui/editors/variablegroupeditor.cpp | 2 +- .../apps/client/src/ui/home/columnwidget.cpp | 2 +- .../client/src/ui/home/gamecolumnwidget.cpp | 30 ++- .../src/ui/home/gamepanelbuttonwidget.cpp | 10 +- .../apps/client/src/ui/home/headerwidget.cpp | 4 +- .../apps/client/src/ui/home/homewidget.cpp | 14 +- .../src/ui/home/multiplayercolumnwidget.cpp | 6 +- .../ui/home/multiplayerpanelbuttonwidget.cpp | 16 +- .../src/ui/home/nogamescolumnwidget.cpp | 2 +- .../src/ui/home/packagescolumnwidget.cpp | 4 +- .../client/src/ui/home/savelistwidget.cpp | 4 +- .../apps/client/src/ui/impulsebinding.cpp | 8 +- doomsday/apps/client/src/ui/infine/finale.cpp | 8 +- .../client/src/ui/infine/finaleanimwidget.cpp | 2 +- .../src/ui/infine/finaleinterpreter.cpp | 208 +++++++-------- .../client/src/ui/infine/finalepagewidget.cpp | 12 +- .../client/src/ui/infine/finaletextwidget.cpp | 6 +- .../client/src/ui/infine/finalewidget.cpp | 4 +- .../client/src/ui/infine/infinesystem.cpp | 10 +- doomsday/apps/client/src/ui/inputdebug.cpp | 16 +- doomsday/apps/client/src/ui/inputdevice.cpp | 36 +-- doomsday/apps/client/src/ui/inputsystem.cpp | 90 +++---- doomsday/apps/client/src/ui/mouse_qt.cpp | 6 +- doomsday/apps/client/src/ui/nativemenu.cpp | 4 +- .../apps/client/src/ui/postprocessing.cpp | 6 +- doomsday/apps/client/src/ui/savelistdata.cpp | 6 +- .../client/src/ui/styledlogsinkformatter.cpp | 4 +- doomsday/apps/client/src/ui/sys_input.cpp | 2 +- doomsday/apps/client/src/ui/ui_main.cpp | 6 +- .../apps/client/src/ui/viewcompositor.cpp | 6 +- .../apps/client/src/ui/widgets/busywidget.cpp | 8 +- .../src/ui/widgets/consolecommandwidget.cpp | 6 +- .../client/src/ui/widgets/consolewidget.cpp | 16 +- .../src/ui/widgets/cvarchoicewidget.cpp | 4 +- .../src/ui/widgets/cvarlineeditwidget.cpp | 4 +- .../src/ui/widgets/cvarnativepathwidget.cpp | 4 +- .../src/ui/widgets/cvarsliderwidget.cpp | 4 +- .../src/ui/widgets/cvartogglewidget.cpp | 4 +- .../apps/client/src/ui/widgets/gamewidget.cpp | 4 +- .../client/src/ui/widgets/homeitemwidget.cpp | 6 +- .../client/src/ui/widgets/homemenuwidget.cpp | 8 +- .../src/ui/widgets/inputbindingwidget.cpp | 12 +- .../src/ui/widgets/keygrabberwidget.cpp | 2 +- .../src/ui/widgets/mapoutlinewidget.cpp | 4 +- .../widgets/multiplayerservermenuwidget.cpp | 16 +- .../ui/widgets/multiplayerstatuswidget.cpp | 6 +- .../widgets/packagecontentoptionswidget.cpp | 4 +- .../src/ui/widgets/packagesbuttonwidget.cpp | 2 +- .../src/ui/widgets/packagessidebarwidget.cpp | 2 +- .../client/src/ui/widgets/packageswidget.cpp | 17 +- .../src/ui/widgets/panelbuttonwidget.cpp | 2 +- .../src/ui/widgets/privilegedlogwidget.cpp | 2 +- .../src/ui/widgets/profilepickerwidget.cpp | 2 +- .../client/src/ui/widgets/sidebarwidget.cpp | 4 +- .../client/src/ui/widgets/taskbarwidget.cpp | 22 +- .../client/src/ui/widgets/tutorialwidget.cpp | 2 +- doomsday/apps/client/src/ui/zonedebug.cpp | 20 +- doomsday/apps/client/src/unix/joystick.cpp | 16 +- .../src/updater/updateavailabledialog.cpp | 4 +- .../src/updater/updatedownloaddialog.cpp | 4 +- doomsday/apps/client/src/updater/updater.cpp | 18 +- .../client/src/updater/updatersettings.cpp | 2 +- .../src/updater/updatersettingsdialog.cpp | 6 +- .../apps/client/src/windows/mouse_win32.cpp | 2 +- .../client/src/world/base/bindings_world.cpp | 4 +- .../apps/client/src/world/base/blockmap.cpp | 4 +- .../src/world/base/clientserverworld.cpp | 34 +-- .../client/src/world/base/convexsubspace.cpp | 4 +- .../src/world/base/impulseaccumulator.cpp | 14 +- .../client/src/world/base/interceptor.cpp | 8 +- doomsday/apps/client/src/world/base/line.cpp | 36 +-- .../client/src/world/base/linesighttest.cpp | 6 +- doomsday/apps/client/src/world/base/map.cpp | 76 +++--- .../apps/client/src/world/base/maputil.cpp | 8 +- .../apps/client/src/world/base/p_mobj.cpp | 26 +- .../apps/client/src/world/base/p_players.cpp | 34 +-- doomsday/apps/client/src/world/base/plane.cpp | 30 +-- .../apps/client/src/world/base/polyobj.cpp | 2 +- .../client/src/world/base/polyobjdata.cpp | 2 +- .../apps/client/src/world/base/sector.cpp | 24 +- doomsday/apps/client/src/world/base/sky.cpp | 46 ++-- .../apps/client/src/world/base/subsector.cpp | 12 +- .../apps/client/src/world/base/surface.cpp | 48 ++-- .../apps/client/src/world/base/thinkers.cpp | 36 +-- .../apps/client/src/world/base/vertex.cpp | 2 +- .../src/world/bsp/convexsubspaceproxy.cpp | 14 +- doomsday/apps/client/src/world/bsp/hplane.cpp | 10 +- .../apps/client/src/world/bsp/linesegment.cpp | 10 +- .../apps/client/src/world/bsp/partitioner.cpp | 24 +- .../src/world/bsp/partitionevaluator.cpp | 6 +- .../client/src/world/bsp/superblockmap.cpp | 2 +- .../src/world/clientmobjthinkerdata.cpp | 4 +- doomsday/apps/client/src/world/contact.cpp | 10 +- .../apps/client/src/world/contactspreader.cpp | 2 +- doomsday/apps/client/src/world/generator.cpp | 18 +- doomsday/apps/client/src/world/mapobject.cpp | 2 +- doomsday/apps/gloom/CMakeLists.txt | 18 +- .../apps/gloom/gloom/audio/audiosystem.cpp | 16 +- doomsday/apps/gloom/gloom/audio/audiosystem.h | 6 +- doomsday/apps/gloom/gloom/geo/polygon.cpp | 12 +- doomsday/apps/gloom/gloom/gloomwidget.cpp | 4 +- doomsday/apps/gloom/gloom/gloomwidget.h | 4 +- doomsday/apps/gloom/gloom/gloomworld.cpp | 8 +- doomsday/apps/gloom/gloom/gloomworld.h | 2 +- doomsday/apps/gloom/gloom/render/bloom.cpp | 2 +- doomsday/apps/gloom/gloom/render/bloom.h | 2 +- .../apps/gloom/gloom/render/entityrender.cpp | 4 +- .../apps/gloom/gloom/render/entityrender.h | 2 +- doomsday/apps/gloom/gloom/render/gbuffer.cpp | 2 +- doomsday/apps/gloom/gloom/render/gbuffer.h | 2 +- doomsday/apps/gloom/gloom/render/light.cpp | 2 +- doomsday/apps/gloom/gloom/render/light.h | 2 +- .../apps/gloom/gloom/render/lightrender.cpp | 4 +- .../apps/gloom/gloom/render/lightrender.h | 2 +- doomsday/apps/gloom/gloom/render/mapbuild.cpp | 20 +- doomsday/apps/gloom/gloom/render/mapbuild.h | 2 +- .../apps/gloom/gloom/render/maprender.cpp | 4 +- doomsday/apps/gloom/gloom/render/maprender.h | 2 +- .../apps/gloom/gloom/render/materiallib.cpp | 6 +- .../apps/gloom/gloom/render/materiallib.h | 2 +- doomsday/apps/gloom/gloom/render/render.cpp | 12 +- doomsday/apps/gloom/gloom/render/render.h | 2 +- .../apps/gloom/gloom/render/screenquad.cpp | 2 +- doomsday/apps/gloom/gloom/render/screenquad.h | 2 +- doomsday/apps/gloom/gloom/render/shadow.cpp | 2 +- doomsday/apps/gloom/gloom/render/shadow.h | 2 +- doomsday/apps/gloom/gloom/render/skybox.cpp | 4 +- doomsday/apps/gloom/gloom/render/skybox.h | 2 +- doomsday/apps/gloom/gloom/render/ssao.cpp | 2 +- doomsday/apps/gloom/gloom/render/ssao.h | 2 +- doomsday/apps/gloom/gloom/render/tonemap.cpp | 2 +- doomsday/apps/gloom/gloom/render/tonemap.h | 2 +- doomsday/apps/gloom/gloom/world/entity.cpp | 2 +- doomsday/apps/gloom/gloom/world/entity.h | 2 +- doomsday/apps/gloom/gloom/world/entitymap.cpp | 2 +- doomsday/apps/gloom/gloom/world/entitymap.h | 2 +- .../apps/gloom/gloom/world/environment.cpp | 2 +- doomsday/apps/gloom/gloom/world/environment.h | 2 +- doomsday/apps/gloom/gloom/world/map.cpp | 62 ++--- doomsday/apps/gloom/gloom/world/map.h | 2 +- doomsday/apps/gloom/gloom/world/mapimport.cpp | 4 +- doomsday/apps/gloom/gloom/world/mapimport.h | 2 +- .../gloom/gloom/world/sectorpolygonizer.cpp | 4 +- .../gloom/gloom/world/sectorpolygonizer.h | 2 +- doomsday/apps/gloom/gloom/world/user.cpp | 14 +- doomsday/apps/gloom/gloom/world/user.h | 12 +- doomsday/apps/gloom/gloom/world/world.h | 4 +- .../shaders/app/fx_blur.dei | 18 +- .../shaders/app/generic.dei | 44 ++-- .../net.dengine.gloom.pack/shaders/app/ui.dei | 30 +-- .../shaders/common/vertex_uv.vsh | 4 +- .../shaders/ssao_denoise.fsh | 4 +- doomsday/apps/gloom/src/approotwidget.cpp | 2 +- doomsday/apps/gloom/src/approotwidget.h | 2 +- doomsday/apps/gloom/src/appwindowsystem.cpp | 2 +- doomsday/apps/gloom/src/appwindowsystem.h | 2 +- doomsday/apps/gloom/src/editor.cpp | 4 +- doomsday/apps/gloom/src/editor.h | 2 +- doomsday/apps/gloom/src/editorwindow.cpp | 2 +- doomsday/apps/gloom/src/editorwindow.h | 2 +- doomsday/apps/gloom/src/globalshortcuts.cpp | 2 +- doomsday/apps/gloom/src/globalshortcuts.h | 2 +- doomsday/apps/gloom/src/gloomapp.cpp | 6 +- doomsday/apps/gloom/src/gloomapp.h | 2 +- doomsday/apps/gloom/src/main.cpp | 4 +- doomsday/apps/gloom/src/mainwindow.cpp | 12 +- doomsday/apps/gloom/src/mainwindow.h | 2 +- doomsday/apps/libdoomsday/CMakeLists.txt | 12 +- doomsday/apps/libdoomsday/api.doxy | 16 +- .../include/doomsday/abstractsession.h | 4 +- .../libdoomsday/include/doomsday/busymode.h | 12 +- .../include/doomsday/console/cmd.h | 8 +- .../libdoomsday/include/doomsday/defs/ded.h | 4 +- .../include/doomsday/defs/dedarray.h | 22 +- .../include/doomsday/defs/dedparser.h | 2 +- .../include/doomsday/defs/dedregister.h | 6 +- .../include/doomsday/defs/sprite.h | 2 +- .../include/doomsday/doomsdayapp.h | 14 +- .../include/doomsday/filesys/file.h | 10 +- .../include/doomsday/filesys/filehandle.h | 8 +- .../include/doomsday/filesys/fileid.h | 16 +- .../include/doomsday/filesys/fileinfo.h | 6 +- .../include/doomsday/filesys/filetype.h | 10 +- .../include/doomsday/filesys/fs_main.h | 28 +- .../include/doomsday/filesys/fs_util.h | 6 +- .../include/doomsday/filesys/idgameslink.h | 2 +- .../doomsday/filesys/idgamespackageinfofile.h | 2 +- .../include/doomsday/filesys/lumpcache.h | 6 +- .../include/doomsday/filesys/lumpindex.h | 12 +- .../include/doomsday/filesys/readfile.h | 4 +- .../include/doomsday/filesys/searchpath.h | 6 +- .../doomsday/filesys/virtualmappings.h | 4 +- .../include/doomsday/filesys/wad.h | 4 +- .../include/doomsday/filesys/zip.h | 4 +- .../apps/libdoomsday/include/doomsday/game.h | 4 +- .../include/doomsday/gameprofiles.h | 4 +- .../apps/libdoomsday/include/doomsday/games.h | 10 +- .../include/doomsday/gamestatefolder.h | 8 +- .../libdoomsday/include/doomsday/player.h | 4 +- .../libdoomsday/include/doomsday/players.h | 2 +- .../libdoomsday/include/doomsday/plugins.h | 8 +- .../include/doomsday/resource/animgroup.h | 2 +- .../include/doomsday/resource/animgroups.h | 2 +- .../include/doomsday/resource/bundles.h | 6 +- .../include/doomsday/resource/colorpalette.h | 8 +- .../include/doomsday/resource/colorpalettes.h | 4 +- .../include/doomsday/resource/composite.h | 2 +- .../include/doomsday/resource/databundle.h | 6 +- .../doomsday/resource/idtech1flatlib.h | 2 +- .../include/doomsday/resource/idtech1image.h | 2 +- .../doomsday/resource/idtech1texturelib.cpp | 4 +- .../doomsday/resource/idtech1texturelib.h | 2 +- .../include/doomsday/resource/lumpcatalog.h | 2 +- .../include/doomsday/resource/lumpdirectory.h | 4 +- .../include/doomsday/resource/manifest.h | 2 +- .../include/doomsday/resource/mapmanifests.h | 2 +- .../include/doomsday/resource/resourceclass.h | 2 +- .../include/doomsday/resource/resources.h | 10 +- .../include/doomsday/resource/sprites.h | 2 +- .../include/doomsday/resource/texture.h | 6 +- .../doomsday/resource/texturemanifest.h | 12 +- .../include/doomsday/resource/textures.h | 2 +- .../include/doomsday/resource/texturescheme.h | 10 +- .../libdoomsday/include/doomsday/savegames.h | 2 +- .../apps/libdoomsday/include/doomsday/uri.h | 10 +- .../include/doomsday/world/bspnode.h | 2 +- .../include/doomsday/world/entitydatabase.h | 2 +- .../libdoomsday/include/doomsday/world/map.h | 10 +- .../include/doomsday/world/mapelement.h | 20 +- .../include/doomsday/world/material.h | 16 +- .../include/doomsday/world/materialarchive.h | 4 +- .../include/doomsday/world/materialmanifest.h | 8 +- .../include/doomsday/world/materials.h | 6 +- .../include/doomsday/world/materialscheme.h | 10 +- .../include/doomsday/world/mobjthinkerdata.h | 2 +- .../include/doomsday/world/thinker.h | 4 +- .../include/doomsday/world/thinkerdata.h | 14 +- .../include/doomsday/world/world.h | 4 +- .../apps/libdoomsday/src/abstractsession.cpp | 2 +- doomsday/apps/libdoomsday/src/busymode.cpp | 44 ++-- .../libdoomsday/src/c_wrapper/library.cpp | 14 +- .../apps/libdoomsday/src/console/alias.cpp | 2 +- doomsday/apps/libdoomsday/src/console/cmd.cpp | 16 +- .../apps/libdoomsday/src/console/exec.cpp | 42 +-- .../libdoomsday/src/console/knownword.cpp | 16 +- doomsday/apps/libdoomsday/src/console/var.cpp | 48 ++-- .../apps/libdoomsday/src/defs/dedparser.cpp | 34 +-- .../apps/libdoomsday/src/defs/dedregister.cpp | 36 +-- doomsday/apps/libdoomsday/src/doomsdayapp.cpp | 52 ++-- .../libdoomsday/src/doomsdayapp_bindings.cpp | 4 +- .../apps/libdoomsday/src/filesys/datafile.cpp | 2 +- .../libdoomsday/src/filesys/datafolder.cpp | 4 +- .../libdoomsday/src/filesys/filehandle.cpp | 4 +- .../apps/libdoomsday/src/filesys/fileid.cpp | 6 +- .../apps/libdoomsday/src/filesys/filetype.cpp | 2 +- .../apps/libdoomsday/src/filesys/fs_main.cpp | 68 ++--- .../libdoomsday/src/filesys/fs_scheme.cpp | 10 +- .../apps/libdoomsday/src/filesys/fs_util.cpp | 26 +- .../libdoomsday/src/filesys/idgameslink.cpp | 6 +- .../src/filesys/idgamespackageinfofile.cpp | 10 +- .../libdoomsday/src/filesys/lumpcache.cpp | 2 +- .../libdoomsday/src/filesys/lumpindex.cpp | 22 +- .../apps/libdoomsday/src/filesys/readfile.cpp | 2 +- .../src/filesys/virtualmappings.cpp | 8 +- doomsday/apps/libdoomsday/src/filesys/wad.cpp | 8 +- doomsday/apps/libdoomsday/src/filesys/zip.cpp | 18 +- doomsday/apps/libdoomsday/src/game.cpp | 8 +- doomsday/apps/libdoomsday/src/game_init.cpp | 12 +- .../apps/libdoomsday/src/gameprofiles.cpp | 6 +- doomsday/apps/libdoomsday/src/games.cpp | 34 +-- .../apps/libdoomsday/src/gamestatefolder.cpp | 16 +- doomsday/apps/libdoomsday/src/help.cpp | 2 +- doomsday/apps/libdoomsday/src/player.cpp | 2 +- doomsday/apps/libdoomsday/src/players.cpp | 8 +- doomsday/apps/libdoomsday/src/plugins.cpp | 42 +-- .../libdoomsday/src/resource/animgroup.cpp | 2 +- .../libdoomsday/src/resource/animgroups.cpp | 2 +- .../apps/libdoomsday/src/resource/bundles.cpp | 36 +-- .../libdoomsday/src/resource/colorpalette.cpp | 6 +- .../src/resource/colorpalettes.cpp | 8 +- .../libdoomsday/src/resource/composite.cpp | 2 +- .../libdoomsday/src/resource/databundle.cpp | 26 +- .../src/resource/idtech1flatlib.cpp | 2 +- .../libdoomsday/src/resource/idtech1image.cpp | 2 +- .../libdoomsday/src/resource/lumpcatalog.cpp | 6 +- .../src/resource/lumpdirectory.cpp | 2 +- .../libdoomsday/src/resource/manifest.cpp | 8 +- .../libdoomsday/src/resource/mapmanifest.cpp | 2 +- .../libdoomsday/src/resource/mapmanifests.cpp | 2 +- .../apps/libdoomsday/src/resource/patch.cpp | 18 +- .../apps/libdoomsday/src/resource/pcx.cpp | 2 +- .../src/resource/resourceclass.cpp | 4 +- .../libdoomsday/src/resource/resources.cpp | 24 +- .../apps/libdoomsday/src/resource/sprites.cpp | 6 +- .../apps/libdoomsday/src/resource/texture.cpp | 12 +- .../src/resource/texturemanifest.cpp | 12 +- .../libdoomsday/src/resource/textures.cpp | 16 +- .../src/resource/texturescheme.cpp | 16 +- doomsday/apps/libdoomsday/src/savegames.cpp | 14 +- doomsday/apps/libdoomsday/src/uri.cpp | 78 +++--- .../apps/libdoomsday/src/world/dmuargs.cpp | 4 +- .../libdoomsday/src/world/entitydatabase.cpp | 18 +- .../apps/libdoomsday/src/world/entitydef.cpp | 26 +- doomsday/apps/libdoomsday/src/world/map.cpp | 12 +- .../apps/libdoomsday/src/world/mapelement.cpp | 2 +- .../apps/libdoomsday/src/world/material.cpp | 38 +-- .../libdoomsday/src/world/materialarchive.cpp | 10 +- .../src/world/materialmanifest.cpp | 12 +- .../apps/libdoomsday/src/world/materials.cpp | 16 +- .../libdoomsday/src/world/materialscheme.cpp | 8 +- .../libdoomsday/src/world/mobjthinkerdata.cpp | 2 +- .../libdoomsday/src/world/propertyvalue.cpp | 2 +- .../apps/libdoomsday/src/world/thinker.cpp | 12 +- .../libdoomsday/src/world/thinkerdata.cpp | 14 +- doomsday/apps/libdoomsday/src/world/world.cpp | 12 +- doomsday/apps/plugins/CMakeLists.txt | 2 +- doomsday/apps/plugins/PluginConfig.cmake | 38 +-- .../apps/plugins/common/include/acs/module.h | 12 +- .../apps/plugins/common/include/acs/script.h | 2 +- .../apps/plugins/common/include/acs/system.h | 4 +- doomsday/apps/plugins/common/include/d_net.h | 4 +- .../apps/plugins/common/include/d_netsv.h | 10 +- .../plugins/common/include/dmu_archiveindex.h | 4 +- .../apps/plugins/common/include/g_common.h | 2 +- .../apps/plugins/common/include/gamerules.h | 2 +- .../apps/plugins/common/include/gamesession.h | 2 +- doomsday/apps/plugins/common/include/hu_lib.h | 2 +- .../apps/plugins/common/include/hu_stuff.h | 18 +- .../plugins/common/include/hud/automapstyle.h | 6 +- .../plugins/common/include/hud/hudwidget.h | 4 +- .../include/hud/widgets/automapwidget.h | 4 +- .../common/include/hud/widgets/chatwidget.h | 4 +- .../common/include/hud/widgets/groupwidget.h | 2 +- .../include/hud/widgets/keyslotwidget.h | 2 +- .../include/hud/widgets/playerlogwidget.h | 2 +- .../plugins/common/include/mapstatereader.h | 2 +- .../plugins/common/include/mapstatewriter.h | 2 +- .../apps/plugins/common/include/menu/page.h | 4 +- .../include/menu/widgets/buttonwidget.h | 2 +- .../include/menu/widgets/coloreditwidget.h | 2 +- .../menu/widgets/cvartextualsliderwidget.h | 2 +- .../include/menu/widgets/cvartogglewidget.h | 2 +- .../common/include/menu/widgets/labelwidget.h | 2 +- .../include/menu/widgets/lineeditwidget.h | 2 +- .../common/include/menu/widgets/listwidget.h | 2 +- .../include/menu/widgets/mobjpreviewwidget.h | 2 +- .../common/include/menu/widgets/rectwidget.h | 2 +- .../include/menu/widgets/sliderwidget.h | 2 +- .../common/include/menu/widgets/widget.h | 6 +- .../apps/plugins/common/include/p_inventory.h | 2 +- doomsday/apps/plugins/common/include/p_map.h | 20 +- .../apps/plugins/common/include/p_mapsetup.h | 2 +- .../apps/plugins/common/include/p_mapspec.h | 2 +- .../apps/plugins/common/include/p_saveg.h | 4 +- .../apps/plugins/common/include/p_start.h | 12 +- doomsday/apps/plugins/common/include/p_tick.h | 6 +- doomsday/apps/plugins/common/include/p_user.h | 22 +- doomsday/apps/plugins/common/include/p_xg.h | 4 +- .../apps/plugins/common/include/p_xgline.h | 4 +- doomsday/apps/plugins/common/include/pause.h | 2 +- .../apps/plugins/common/include/r_common.h | 4 +- .../apps/plugins/common/include/saveslots.h | 6 +- .../plugins/common/include/thingarchive.h | 2 +- .../plugins/common/src/acs/interpreter.cpp | 16 +- .../apps/plugins/common/src/acs/module.cpp | 6 +- .../apps/plugins/common/src/acs/script.cpp | 12 +- .../apps/plugins/common/src/acs/system.cpp | 20 +- doomsday/apps/plugins/common/src/animdefs.cpp | 2 +- doomsday/apps/plugins/common/src/fi_lib.cpp | 12 +- .../apps/plugins/common/src/g_controls.cpp | 2 +- .../common/src/game/g_eventsequence.cpp | 8 +- .../apps/plugins/common/src/game/g_game.cpp | 64 ++--- .../plugins/common/src/game/gamerules.cpp | 8 +- .../plugins/common/src/game/gamesession.cpp | 28 +- .../plugins/common/src/game/saveslots.cpp | 26 +- .../apps/plugins/common/src/hu_inventory.cpp | 6 +- doomsday/apps/plugins/common/src/hu_lib.cpp | 10 +- doomsday/apps/plugins/common/src/hu_menu.cpp | 20 +- doomsday/apps/plugins/common/src/hu_msg.cpp | 8 +- doomsday/apps/plugins/common/src/hu_stuff.cpp | 6 +- .../plugins/common/src/hud/automapstyle.cpp | 20 +- .../apps/plugins/common/src/hud/hudwidget.cpp | 4 +- .../common/src/hud/widgets/armorwidget.cpp | 6 +- .../common/src/hud/widgets/automapwidget.cpp | 30 +-- .../common/src/hud/widgets/chainwidget.cpp | 6 +- .../common/src/hud/widgets/chatwidget.cpp | 6 +- .../common/src/hud/widgets/flightwidget.cpp | 6 +- .../common/src/hud/widgets/fragswidget.cpp | 8 +- .../common/src/hud/widgets/groupwidget.cpp | 6 +- .../common/src/hud/widgets/healthwidget.cpp | 8 +- .../common/src/hud/widgets/itemswidget.cpp | 6 +- .../common/src/hud/widgets/keyslotwidget.cpp | 8 +- .../common/src/hud/widgets/keyswidget.cpp | 6 +- .../common/src/hud/widgets/killswidget.cpp | 6 +- .../src/hud/widgets/playerlogwidget.cpp | 10 +- .../src/hud/widgets/readyammoiconwidget.cpp | 8 +- .../src/hud/widgets/readyammowidget.cpp | 16 +- .../src/hud/widgets/readyitemwidget.cpp | 16 +- .../common/src/hud/widgets/secretswidget.cpp | 6 +- .../apps/plugins/common/src/menu/page.cpp | 16 +- .../common/src/menu/widgets/buttonwidget.cpp | 2 +- .../src/menu/widgets/coloreditwidget.cpp | 2 +- .../menu/widgets/cvartextualsliderwidget.cpp | 2 +- .../src/menu/widgets/cvartogglewidget.cpp | 2 +- .../src/menu/widgets/inputbindingwidget.cpp | 4 +- .../common/src/menu/widgets/labelwidget.cpp | 2 +- .../src/menu/widgets/lineeditwidget.cpp | 2 +- .../common/src/menu/widgets/listwidget.cpp | 2 +- .../src/menu/widgets/mobjpreviewwidget.cpp | 4 +- .../common/src/menu/widgets/rectwidget.cpp | 2 +- .../common/src/menu/widgets/sliderwidget.cpp | 2 +- .../common/src/menu/widgets/widget.cpp | 2 +- .../apps/plugins/common/src/network/d_net.cpp | 8 +- .../plugins/common/src/network/d_netcl.cpp | 12 +- .../plugins/common/src/network/d_netsv.cpp | 14 +- .../apps/plugins/common/src/p_inventory.cpp | 4 +- doomsday/apps/plugins/common/src/p_iterlist.c | 14 +- doomsday/apps/plugins/common/src/p_saveg.cpp | 12 +- doomsday/apps/plugins/common/src/p_saveio.cpp | 26 +- doomsday/apps/plugins/common/src/p_user.c | 2 +- doomsday/apps/plugins/common/src/r_common.c | 6 +- .../apps/plugins/common/src/world/dmu_lib.cpp | 6 +- .../common/src/world/mapstatereader.cpp | 32 +-- .../common/src/world/mapstatewriter.cpp | 16 +- .../apps/plugins/common/src/world/mobj.cpp | 20 +- .../apps/plugins/common/src/world/p_actor.cpp | 24 +- .../plugins/common/src/world/p_ceiling.cpp | 6 +- .../apps/plugins/common/src/world/p_door.cpp | 4 +- .../apps/plugins/common/src/world/p_floor.cpp | 6 +- .../apps/plugins/common/src/world/p_map.cpp | 24 +- .../plugins/common/src/world/p_mapsetup.cpp | 6 +- .../plugins/common/src/world/p_mapspec.cpp | 8 +- .../apps/plugins/common/src/world/p_plat.cpp | 6 +- .../plugins/common/src/world/p_scroll.cpp | 8 +- .../apps/plugins/common/src/world/p_start.cpp | 14 +- .../plugins/common/src/world/p_switch.cpp | 4 +- .../plugins/common/src/world/p_xgline.cpp | 12 +- .../plugins/common/src/world/p_xgsave.cpp | 4 +- .../apps/plugins/common/src/world/p_xgsec.cpp | 42 +-- .../apps/plugins/common/src/world/pause.cpp | 2 +- .../apps/plugins/common/src/world/player.cpp | 36 +-- .../plugins/common/src/world/polyobjs.cpp | 32 +-- .../plugins/common/src/world/thingarchive.cpp | 16 +- .../apps/plugins/directsound/CMakeLists.txt | 4 +- .../directsound/src/driver_directsound.cpp | 34 +-- doomsday/apps/plugins/doom/CMakeLists.txt | 4 +- doomsday/apps/plugins/doom/doom.doxy | 16 +- doomsday/apps/plugins/doom/include/acfnlink.h | 2 +- .../apps/plugins/doom/include/bossbrain.h | 4 +- doomsday/apps/plugins/doom/include/d_api.h | 44 ++-- doomsday/apps/plugins/doom/include/d_items.h | 2 +- doomsday/apps/plugins/doom/include/d_main.h | 14 +- .../apps/plugins/doom/include/d_refresh.h | 2 +- doomsday/apps/plugins/doom/include/doomdef.h | 2 +- .../doom/include/doomv9mapstatereader.h | 2 +- doomsday/apps/plugins/doom/include/g_game.h | 16 +- .../doom/include/hud/widgets/facewidget.h | 2 +- doomsday/apps/plugins/doom/include/p_local.h | 4 +- doomsday/apps/plugins/doom/include/r_defs.h | 4 +- doomsday/apps/plugins/doom/include/tables.h | 8 +- doomsday/apps/plugins/doom/include/version.h | 4 +- doomsday/apps/plugins/doom/src/bossbrain.cpp | 12 +- doomsday/apps/plugins/doom/src/d_api.cpp | 118 ++++----- doomsday/apps/plugins/doom/src/d_console.cpp | 2 +- doomsday/apps/plugins/doom/src/d_items.cpp | 4 +- doomsday/apps/plugins/doom/src/d_main.cpp | 2 +- doomsday/apps/plugins/doom/src/d_refresh.cpp | 4 +- .../plugins/doom/src/doomv9mapstatereader.cpp | 20 +- .../doom/src/hud/widgets/ammowidget.cpp | 4 +- .../doom/src/hud/widgets/armoriconwidget.cpp | 4 +- .../doom/src/hud/widgets/facewidget.cpp | 4 +- .../doom/src/hud/widgets/healthiconwidget.cpp | 4 +- .../doom/src/hud/widgets/maxammowidget.cpp | 4 +- .../doom/src/hud/widgets/weaponslotwidget.cpp | 4 +- .../apps/plugins/doom/src/intermission.cpp | 12 +- doomsday/apps/plugins/doom/src/m_cheat.cpp | 26 +- doomsday/apps/plugins/doom/src/p_enemy.c | 12 +- doomsday/apps/plugins/doom/src/p_inter.c | 28 +- doomsday/apps/plugins/doom/src/p_lights.cpp | 14 +- doomsday/apps/plugins/doom/src/p_pspr.c | 2 +- doomsday/apps/plugins/doom/src/p_spec.cpp | 2 +- doomsday/apps/plugins/doom/src/st_stuff.cpp | 20 +- doomsday/apps/plugins/doom64/CMakeLists.txt | 4 +- .../apps/plugins/doom64/include/acfnlink.h | 2 +- .../apps/plugins/doom64/include/d64_api.h | 44 ++-- .../apps/plugins/doom64/include/d_items.h | 2 +- doomsday/apps/plugins/doom64/include/d_main.h | 14 +- .../apps/plugins/doom64/include/d_refresh.h | 2 +- .../apps/plugins/doom64/include/doomdef.h | 2 +- doomsday/apps/plugins/doom64/include/g_game.h | 16 +- .../apps/plugins/doom64/include/p_inter.h | 4 +- doomsday/apps/plugins/doom64/include/r_defs.h | 6 +- doomsday/apps/plugins/doom64/include/tables.h | 8 +- .../apps/plugins/doom64/include/version.h | 4 +- doomsday/apps/plugins/doom64/src/d64_api.cpp | 118 ++++----- .../apps/plugins/doom64/src/d_console.cpp | 2 +- doomsday/apps/plugins/doom64/src/d_items.cpp | 4 +- doomsday/apps/plugins/doom64/src/d_main.cpp | 2 +- .../apps/plugins/doom64/src/d_refresh.cpp | 6 +- .../src/hud/widgets/armoriconwidget.cpp | 4 +- .../src/hud/widgets/healthiconwidget.cpp | 4 +- .../apps/plugins/doom64/src/intermission.cpp | 4 +- doomsday/apps/plugins/doom64/src/m_cheat.cpp | 16 +- doomsday/apps/plugins/doom64/src/p_enemy.c | 10 +- doomsday/apps/plugins/doom64/src/p_inter.c | 4 +- doomsday/apps/plugins/doom64/src/p_lights.cpp | 16 +- doomsday/apps/plugins/doom64/src/p_pspr.c | 2 +- doomsday/apps/plugins/doom64/src/p_spec.cpp | 2 +- doomsday/apps/plugins/doom64/src/p_telept.c | 4 +- doomsday/apps/plugins/doom64/src/st_stuff.cpp | 14 +- doomsday/apps/plugins/example/CMakeLists.txt | 2 +- .../apps/plugins/example/include/version.h | 4 +- doomsday/apps/plugins/example/src/example.c | 24 +- .../apps/plugins/fluidsynth/CMakeLists.txt | 14 +- .../fluidsynth/include/driver_fluidsynth.h | 2 +- .../fluidsynth/src/driver_fluidsynth.cpp | 12 +- .../fluidsynth/src/fluidsynth_music.cpp | 24 +- doomsday/apps/plugins/fmod/CMakeLists.txt | 8 +- .../apps/plugins/fmod/include/driver_fmod.h | 2 +- .../apps/plugins/fmod/src/driver_fmod.cpp | 66 ++--- doomsday/apps/plugins/fmod/src/fmod_cd.cpp | 4 +- doomsday/apps/plugins/fmod/src/fmod_sfx.cpp | 16 +- doomsday/apps/plugins/heretic/CMakeLists.txt | 4 +- doomsday/apps/plugins/heretic/heretic.doxy | 16 +- .../apps/plugins/heretic/include/acfnlink.h | 2 +- .../apps/plugins/heretic/include/doomdef.h | 2 +- .../apps/plugins/heretic/include/g_game.h | 12 +- doomsday/apps/plugins/heretic/include/h_api.h | 44 ++-- .../apps/plugins/heretic/include/h_items.h | 2 +- .../apps/plugins/heretic/include/h_main.h | 14 +- .../apps/plugins/heretic/include/h_refresh.h | 2 +- .../include/hereticv13mapstatereader.h | 2 +- .../include/hud/widgets/tomeofpowerwidget.h | 2 +- .../apps/plugins/heretic/include/p_inter.h | 4 +- .../apps/plugins/heretic/include/p_local.h | 2 +- .../apps/plugins/heretic/include/r_defs.h | 4 +- .../apps/plugins/heretic/include/tables.h | 8 +- .../apps/plugins/heretic/include/version.h | 4 +- doomsday/apps/plugins/heretic/src/h_api.cpp | 116 ++++---- .../apps/plugins/heretic/src/h_console.cpp | 2 +- doomsday/apps/plugins/heretic/src/h_items.cpp | 2 +- doomsday/apps/plugins/heretic/src/h_main.cpp | 2 +- .../apps/plugins/heretic/src/h_refresh.cpp | 4 +- .../heretic/src/hereticv13mapstatereader.cpp | 26 +- .../src/hud/widgets/tomeofpowerwidget.cpp | 6 +- .../apps/plugins/heretic/src/intermission.cpp | 10 +- doomsday/apps/plugins/heretic/src/m_cheat.cpp | 40 +-- doomsday/apps/plugins/heretic/src/p_enemy.c | 6 +- doomsday/apps/plugins/heretic/src/p_inter.c | 42 +-- .../apps/plugins/heretic/src/p_lights.cpp | 12 +- doomsday/apps/plugins/heretic/src/p_mobj.c | 2 +- doomsday/apps/plugins/heretic/src/p_spec.cpp | 2 +- .../apps/plugins/heretic/src/st_stuff.cpp | 24 +- doomsday/apps/plugins/hexen/CMakeLists.txt | 4 +- doomsday/apps/plugins/hexen/hexen.doxy | 14 +- .../apps/plugins/hexen/include/acfnlink.h | 2 +- doomsday/apps/plugins/hexen/include/g_game.h | 10 +- doomsday/apps/plugins/hexen/include/h2def.h | 12 +- .../include/hud/widgets/worldtimewidget.h | 2 +- .../plugins/hexen/include/lightninganimator.h | 2 +- doomsday/apps/plugins/hexen/include/p_inter.h | 2 +- doomsday/apps/plugins/hexen/include/p_local.h | 4 +- doomsday/apps/plugins/hexen/include/p_spec.h | 4 +- doomsday/apps/plugins/hexen/include/r_defs.h | 4 +- doomsday/apps/plugins/hexen/include/version.h | 4 +- doomsday/apps/plugins/hexen/include/x_api.h | 44 ++-- doomsday/apps/plugins/hexen/include/x_items.h | 2 +- doomsday/apps/plugins/hexen/include/x_main.h | 12 +- .../apps/plugins/hexen/include/x_refresh.h | 2 +- doomsday/apps/plugins/hexen/include/x_state.h | 6 +- doomsday/apps/plugins/hexen/src/a_action.c | 2 +- doomsday/apps/plugins/hexen/src/h2_main.cpp | 2 +- doomsday/apps/plugins/hexen/src/hconsole.cpp | 2 +- .../src/hud/widgets/armoriconswidget.cpp | 4 +- .../src/hud/widgets/bluemanaiconwidget.cpp | 8 +- .../src/hud/widgets/bluemanavialwidget.cpp | 4 +- .../hexen/src/hud/widgets/bluemanawidget.cpp | 8 +- .../hexen/src/hud/widgets/bootswidget.cpp | 4 +- .../hexen/src/hud/widgets/defensewidget.cpp | 4 +- .../src/hud/widgets/greenmanaiconwidget.cpp | 8 +- .../src/hud/widgets/greenmanavialwidget.cpp | 4 +- .../hexen/src/hud/widgets/greenmanawidget.cpp | 8 +- .../hexen/src/hud/widgets/servantwidget.cpp | 4 +- .../src/hud/widgets/weaponpieceswidget.cpp | 4 +- .../hexen/src/hud/widgets/worldtimewidget.cpp | 8 +- .../apps/plugins/hexen/src/intermission.cpp | 2 +- .../plugins/hexen/src/lightninganimator.cpp | 2 +- doomsday/apps/plugins/hexen/src/m_cheat.cpp | 40 +-- doomsday/apps/plugins/hexen/src/p_enemy.c | 6 +- doomsday/apps/plugins/hexen/src/p_inter.c | 24 +- doomsday/apps/plugins/hexen/src/p_lights.cpp | 8 +- doomsday/apps/plugins/hexen/src/p_pillar.cpp | 6 +- doomsday/apps/plugins/hexen/src/p_pspr.c | 2 +- doomsday/apps/plugins/hexen/src/p_spec.cpp | 8 +- doomsday/apps/plugins/hexen/src/p_waggle.cpp | 6 +- doomsday/apps/plugins/hexen/src/st_stuff.cpp | 30 +-- doomsday/apps/plugins/hexen/src/x_api.cpp | 116 ++++---- .../apps/plugins/importdeh/CMakeLists.txt | 2 +- .../plugins/importdeh/include/importdeh.h | 10 +- .../apps/plugins/importdeh/src/dehreader.cpp | 20 +- .../apps/plugins/importdeh/src/importdeh.cpp | 32 +-- .../apps/plugins/importidtech1/CMakeLists.txt | 4 +- .../plugins/importidtech1/include/hexlex.h | 4 +- .../importidtech1/include/importidtech1.h | 12 +- .../importidtech1/include/mapimporter.h | 4 +- .../importidtech1/include/mapinfotranslator.h | 2 +- .../apps/plugins/importidtech1/src/hexlex.cpp | 2 +- .../importidtech1/src/importidtech1.cpp | 44 ++-- .../plugins/importidtech1/src/mapimporter.cpp | 36 +-- .../importidtech1/src/mapinfotranslator.cpp | 6 +- .../apps/plugins/importsave/CMakeLists.txt | 2 +- .../plugins/importsave/include/importsave.h | 4 +- .../plugins/importsave/src/importsave.cpp | 8 +- .../apps/plugins/importudmf/CMakeLists.txt | 4 +- .../plugins/importudmf/include/importudmf.h | 6 +- .../plugins/importudmf/include/udmfparser.h | 2 +- .../plugins/importudmf/src/importudmf.cpp | 26 +- .../plugins/importudmf/src/udmfparser.cpp | 2 +- .../apps/plugins/libgamefw/CMakeLists.txt | 6 +- .../apps/plugins/libgamefw/src/libgamefw.cpp | 2 +- doomsday/apps/plugins/openal/CMakeLists.txt | 4 +- .../apps/plugins/openal/src/driver_openal.cpp | 12 +- doomsday/apps/plugins/winmm/CMakeLists.txt | 2 +- doomsday/apps/plugins/winmm/include/dswinmm.h | 2 +- doomsday/apps/plugins/winmm/src/dswinmm.cpp | 10 +- doomsday/apps/server/CMakeLists.txt | 6 +- doomsday/apps/server/include/remotefeeduser.h | 2 +- doomsday/apps/server/include/remoteuser.h | 2 +- .../apps/server/include/server/sv_sound.h | 6 +- doomsday/apps/server/include/server_dummies.h | 38 +-- doomsday/apps/server/include/serverapp.h | 2 +- doomsday/apps/server/include/serverplayer.h | 2 +- doomsday/apps/server/include/serversystem.h | 4 +- doomsday/apps/server/include/shelluser.h | 2 +- doomsday/apps/server/include/shellusers.h | 4 +- doomsday/apps/server/include/users.h | 6 +- doomsday/apps/server/src/remotefeeduser.cpp | 14 +- doomsday/apps/server/src/remoteuser.cpp | 6 +- doomsday/apps/server/src/server/sv_frame.cpp | 26 +- doomsday/apps/server/src/server/sv_main.cpp | 28 +- doomsday/apps/server/src/server/sv_pool.cpp | 48 ++-- doomsday/apps/server/src/server/sv_sound.cpp | 2 +- doomsday/apps/server/src/server_dummies.cpp | 40 +-- doomsday/apps/server/src/serverapp.cpp | 14 +- doomsday/apps/server/src/serverplayer.cpp | 2 +- doomsday/apps/server/src/serversystem.cpp | 24 +- doomsday/apps/server/src/shelluser.cpp | 8 +- doomsday/apps/server/src/shellusers.cpp | 4 +- doomsday/apps/server/src/users.cpp | 6 +- doomsday/build/debian/rules | 4 +- doomsday/cmake/Arch.cmake | 10 +- doomsday/cmake/BuildTypes.cmake | 22 +- doomsday/cmake/Config.cmake | 46 ++-- doomsday/cmake/FindAssimp.cmake | 6 +- doomsday/cmake/FindCcache.cmake | 10 +- doomsday/cmake/FindDirectX.cmake | 2 +- doomsday/cmake/FindGlib.cmake | 22 +- doomsday/cmake/FindLZSS.cmake | 6 +- doomsday/cmake/FindOculusVR.cmake | 6 +- doomsday/cmake/FindSDL2.cmake | 8 +- doomsday/cmake/InstallPrefix.cmake | 6 +- doomsday/cmake/LegacyPK3s.cmake | 16 +- doomsday/cmake/MacOSXBundleInfo.plist.in | 4 +- .../cmake/MacOSXPluginBundleInfo.plist.in | 8 +- doomsday/cmake/Macros.cmake | 132 +++++----- doomsday/cmake/Options.cmake | 46 ++-- doomsday/cmake/Packaging.cmake | 46 ++-- doomsday/cmake/PlatformMacx.cmake | 22 +- doomsday/cmake/PlatformUnix.cmake | 30 +-- doomsday/cmake/PlatformWindows.cmake | 36 +-- doomsday/cmake/PlatformiOS.cmake | 40 +-- doomsday/cmake/QtInstallNames.cmake | 4 +- doomsday/cmake/Version.cmake | 30 +-- doomsday/cmake/ZLIB.cmake | 6 +- doomsday/cmake/config/DengCoreConfig.cmake | 2 +- .../cmake/config/DengDoomsdayConfig.cmake | 2 +- doomsday/cmake/config/DengGuiConfig.cmake | 16 +- doomsday/cmake/iOSBundleInfo.plist.in | 4 +- doomsday/libs/CMakeLists.txt | 2 +- doomsday/libs/appfw/CMakeLists.txt | 2 +- .../include/de/dialogs/directorylistdialog.h | 2 +- .../appfw/include/de/dialogs/inputdialog.h | 2 +- .../appfw/include/de/dialogs/messagedialog.h | 2 +- .../appfw/include/de/framework/baseguiapp.h | 4 +- .../appfw/include/de/framework/basewindow.h | 6 +- .../de/framework/childwidgetorganizer.h | 6 +- .../libs/appfw/include/de/framework/data.h | 8 +- .../de/framework/dialogcontentstylist.h | 4 +- .../appfw/include/de/framework/filtereddata.h | 4 +- .../include/de/framework/fontlinewrapping.h | 2 +- .../include/de/framework/gltextcomposer.h | 2 +- .../appfw/include/de/framework/gridlayout.h | 2 +- .../include/de/framework/guirootwidget.h | 2 +- .../appfw/include/de/framework/guiwidget.h | 2 +- .../include/de/framework/guiwidgetprivate.h | 12 +- .../libs/appfw/include/de/framework/item.h | 6 +- .../libs/appfw/include/de/framework/margins.h | 4 +- .../libs/appfw/include/de/framework/painter.h | 2 +- .../include/de/framework/proceduralimage.h | 2 +- .../include/de/framework/sequentiallayout.h | 2 +- .../libs/appfw/include/de/framework/style.h | 4 +- .../appfw/include/de/framework/textdrawable.h | 2 +- .../appfw/include/de/framework/untrapper.h | 2 +- .../include/de/framework/vrwindowtransform.h | 2 +- .../appfw/include/de/framework/windowsystem.h | 6 +- .../include/de/framework/windowtransform.h | 4 +- .../libs/appfw/include/de/vr/oculusrift.h | 2 +- doomsday/libs/appfw/include/de/vr/vrconfig.h | 2 +- .../include/de/widgets/auxbuttonwidget.h | 2 +- .../appfw/include/de/widgets/buttonwidget.h | 8 +- .../appfw/include/de/widgets/choicewidget.h | 2 +- .../appfw/include/de/widgets/commandwidget.h | 2 +- .../include/de/widgets/compositorwidget.h | 2 +- .../appfw/include/de/widgets/dialogwidget.h | 4 +- .../include/de/widgets/directoryarraywidget.h | 2 +- .../include/de/widgets/documentpopupwidget.h | 2 +- .../appfw/include/de/widgets/documentwidget.h | 2 +- .../include/de/widgets/fadetoblackwidget.h | 2 +- .../appfw/include/de/widgets/focuswidget.h | 2 +- .../include/de/widgets/foldpanelwidget.h | 2 +- .../include/de/widgets/gridpopupwidget.h | 2 +- .../appfw/include/de/widgets/labelwidget.h | 2 +- .../appfw/include/de/widgets/lineeditwidget.h | 4 +- .../libs/appfw/include/de/widgets/logwidget.h | 2 +- .../appfw/include/de/widgets/menuwidget.h | 4 +- .../de/widgets/notificationareawidget.h | 2 +- .../appfw/include/de/widgets/panelwidget.h | 6 +- .../include/de/widgets/popupbuttonwidget.h | 2 +- .../include/de/widgets/popupmenuwidget.h | 2 +- .../appfw/include/de/widgets/popupwidget.h | 2 +- .../appfw/include/de/widgets/progresswidget.h | 2 +- .../appfw/include/de/widgets/relaywidget.h | 4 +- .../include/de/widgets/scriptcommandwidget.h | 2 +- .../include/de/widgets/scrollareawidget.h | 2 +- .../appfw/include/de/widgets/sliderwidget.h | 2 +- .../libs/appfw/include/de/widgets/tabwidget.h | 2 +- .../appfw/include/de/widgets/togglewidget.h | 4 +- .../include/de/widgets/variablearraywidget.h | 4 +- .../include/de/widgets/variablechoicewidget.h | 4 +- .../de/widgets/variablelineeditwidget.h | 4 +- .../include/de/widgets/variablesliderwidget.h | 4 +- .../include/de/widgets/variabletogglewidget.h | 4 +- doomsday/libs/appfw/src/baseguiapp.cpp | 12 +- doomsday/libs/appfw/src/basewindow.cpp | 28 +- .../libs/appfw/src/childwidgetorganizer.cpp | 60 ++--- doomsday/libs/appfw/src/data.cpp | 14 +- .../libs/appfw/src/dialogcontentstylist.cpp | 2 +- .../appfw/src/dialogs/directorylistdialog.cpp | 6 +- .../libs/appfw/src/dialogs/inputdialog.cpp | 2 +- .../libs/appfw/src/dialogs/messagedialog.cpp | 2 +- doomsday/libs/appfw/src/filtereddata.cpp | 26 +- doomsday/libs/appfw/src/fontlinewrapping.cpp | 56 ++-- doomsday/libs/appfw/src/gltextcomposer.cpp | 22 +- doomsday/libs/appfw/src/gridlayout.cpp | 50 ++-- doomsday/libs/appfw/src/guirootwidget.cpp | 28 +- doomsday/libs/appfw/src/guiwidget.cpp | 36 +-- doomsday/libs/appfw/src/item.cpp | 10 +- doomsday/libs/appfw/src/listdata.cpp | 14 +- doomsday/libs/appfw/src/margins.cpp | 10 +- doomsday/libs/appfw/src/painter.cpp | 14 +- doomsday/libs/appfw/src/sequentiallayout.cpp | 8 +- doomsday/libs/appfw/src/style.cpp | 4 +- doomsday/libs/appfw/src/textdrawable.cpp | 32 +-- doomsday/libs/appfw/src/untrapper.cpp | 2 +- doomsday/libs/appfw/src/vr/oculusrift.cpp | 100 +++---- doomsday/libs/appfw/src/vr/vrconfig.cpp | 2 +- doomsday/libs/appfw/src/vrwindowtransform.cpp | 8 +- .../appfw/src/widgets/auxbuttonwidget.cpp | 4 +- .../libs/appfw/src/widgets/buttonwidget.cpp | 22 +- .../libs/appfw/src/widgets/choicewidget.cpp | 14 +- .../libs/appfw/src/widgets/commandwidget.cpp | 2 +- .../appfw/src/widgets/compositorwidget.cpp | 8 +- .../libs/appfw/src/widgets/dialogwidget.cpp | 26 +- .../src/widgets/directoryarraywidget.cpp | 6 +- .../appfw/src/widgets/documentpopupwidget.cpp | 4 +- .../libs/appfw/src/widgets/documentwidget.cpp | 6 +- .../appfw/src/widgets/fadetoblackwidget.cpp | 2 +- .../libs/appfw/src/widgets/focuswidget.cpp | 2 +- .../appfw/src/widgets/foldpanelwidget.cpp | 6 +- .../appfw/src/widgets/gridpopupwidget.cpp | 2 +- .../libs/appfw/src/widgets/labelwidget.cpp | 2 +- .../libs/appfw/src/widgets/lineeditwidget.cpp | 10 +- doomsday/libs/appfw/src/widgets/logwidget.cpp | 26 +- .../libs/appfw/src/widgets/menuwidget.cpp | 36 +-- .../src/widgets/notificationareawidget.cpp | 14 +- .../libs/appfw/src/widgets/panelwidget.cpp | 20 +- .../appfw/src/widgets/popupbuttonwidget.cpp | 8 +- .../appfw/src/widgets/popupmenuwidget.cpp | 14 +- .../libs/appfw/src/widgets/popupwidget.cpp | 6 +- .../libs/appfw/src/widgets/progresswidget.cpp | 24 +- .../libs/appfw/src/widgets/relaywidget.cpp | 10 +- .../appfw/src/widgets/scriptcommandwidget.cpp | 8 +- .../appfw/src/widgets/scrollareawidget.cpp | 30 +-- .../libs/appfw/src/widgets/sliderwidget.cpp | 4 +- doomsday/libs/appfw/src/widgets/tabwidget.cpp | 14 +- .../libs/appfw/src/widgets/togglewidget.cpp | 10 +- .../appfw/src/widgets/variablearraywidget.cpp | 10 +- .../src/widgets/variablechoicewidget.cpp | 6 +- .../src/widgets/variablelineeditwidget.cpp | 6 +- .../src/widgets/variablesliderwidget.cpp | 6 +- .../src/widgets/variabletogglewidget.cpp | 8 +- doomsday/libs/appfw/src/windowsystem.cpp | 6 +- doomsday/libs/appfw/src/windowtransform.cpp | 4 +- doomsday/libs/core/CMakeLists.txt | 28 +- doomsday/libs/core/include/de/c_wrapper.h | 88 +++---- doomsday/libs/core/include/de/charsymbols.h | 60 ++--- .../libs/core/include/de/concurrency/async.h | 12 +- .../include/de/concurrency/asynccallback.h | 6 +- .../libs/core/include/de/concurrency/guard.h | 36 +-- .../core/include/de/concurrency/lockable.h | 8 +- .../de/concurrency/readwritelockable.h | 10 +- .../libs/core/include/de/concurrency/task.h | 8 +- .../core/include/de/concurrency/taskpool.h | 12 +- .../core/include/de/concurrency/waitable.h | 12 +- doomsday/libs/core/include/de/core/app.h | 26 +- doomsday/libs/core/include/de/core/asset.h | 28 +- doomsday/libs/core/include/de/core/clock.h | 14 +- .../libs/core/include/de/core/commandline.h | 22 +- doomsday/libs/core/include/de/core/config.h | 10 +- .../libs/core/include/de/core/debuglogsink.h | 6 +- doomsday/libs/core/include/de/core/event.h | 10 +- .../libs/core/include/de/core/filelogsink.h | 6 +- doomsday/libs/core/include/de/core/garbage.h | 24 +- .../include/de/core/highperformancetimer.h | 10 +- doomsday/libs/core/include/de/core/id.h | 12 +- doomsday/libs/core/include/de/core/library.h | 24 +- doomsday/libs/core/include/de/core/log.h | 30 +-- .../libs/core/include/de/core/logbuffer.h | 10 +- .../libs/core/include/de/core/logfilter.h | 14 +- doomsday/libs/core/include/de/core/logsink.h | 10 +- doomsday/libs/core/include/de/core/loop.h | 14 +- doomsday/libs/core/include/de/core/matrix.h | 46 ++-- .../libs/core/include/de/core/memorylogsink.h | 8 +- .../de/core/monospacelogsinkformatter.h | 8 +- doomsday/libs/core/include/de/core/range.h | 6 +- .../libs/core/include/de/core/rectangle.h | 6 +- doomsday/libs/core/include/de/core/system.h | 10 +- doomsday/libs/core/include/de/core/textapp.h | 12 +- .../core/include/de/core/textstreamlogsink.h | 6 +- doomsday/libs/core/include/de/core/unixinfo.h | 8 +- doomsday/libs/core/include/de/core/vector.h | 12 +- doomsday/libs/core/include/de/core/version.h | 12 +- .../core/include/de/data/animationvalue.h | 10 +- doomsday/libs/core/include/de/data/archive.h | 20 +- .../libs/core/include/de/data/arrayvalue.h | 12 +- doomsday/libs/core/include/de/data/bank.h | 22 +- .../libs/core/include/de/data/binarytree.h | 14 +- doomsday/libs/core/include/de/data/bitfield.h | 16 +- doomsday/libs/core/include/de/data/block.h | 8 +- .../libs/core/include/de/data/blockvalue.h | 8 +- .../libs/core/include/de/data/byteorder.h | 18 +- .../libs/core/include/de/data/byterefarray.h | 10 +- .../libs/core/include/de/data/bytesubarray.h | 10 +- .../core/include/de/data/compiledrecord.h | 8 +- .../core/include/de/data/conditionaltrigger.h | 10 +- doomsday/libs/core/include/de/data/counted.h | 12 +- .../libs/core/include/de/data/dataarray.h | 4 +- doomsday/libs/core/include/de/data/date.h | 10 +- .../libs/core/include/de/data/deletable.h | 26 +- .../core/include/de/data/dictionaryvalue.h | 10 +- .../libs/core/include/de/data/escapeparser.h | 16 +- doomsday/libs/core/include/de/data/fifo.h | 18 +- .../core/include/de/data/fixedbytearray.h | 8 +- doomsday/libs/core/include/de/data/gzip.h | 8 +- doomsday/libs/core/include/de/data/huffman.h | 6 +- doomsday/libs/core/include/de/data/iblock.h | 6 +- .../libs/core/include/de/data/ibytearray.h | 10 +- .../libs/core/include/de/data/iiostream.h | 8 +- doomsday/libs/core/include/de/data/iistream.h | 8 +- doomsday/libs/core/include/de/data/info.h | 30 +-- doomsday/libs/core/include/de/data/infobank.h | 10 +- doomsday/libs/core/include/de/data/iostream.h | 8 +- .../libs/core/include/de/data/ireadable.h | 8 +- .../libs/core/include/de/data/iserializable.h | 10 +- .../libs/core/include/de/data/iwritable.h | 8 +- doomsday/libs/core/include/de/data/json.h | 10 +- .../core/include/de/data/nativepointervalue.h | 10 +- .../libs/core/include/de/data/nonevalue.h | 8 +- .../libs/core/include/de/data/numbervalue.h | 8 +- .../libs/core/include/de/data/observers.h | 118 ++++----- .../libs/core/include/de/data/partition.h | 6 +- doomsday/libs/core/include/de/data/path.h | 18 +- doomsday/libs/core/include/de/data/pathtree.h | 26 +- .../libs/core/include/de/data/pointerset.h | 12 +- doomsday/libs/core/include/de/data/profiles.h | 24 +- doomsday/libs/core/include/de/data/property.h | 20 +- doomsday/libs/core/include/de/data/reader.h | 14 +- doomsday/libs/core/include/de/data/record.h | 24 +- .../core/include/de/data/recordaccessor.h | 12 +- .../libs/core/include/de/data/recordvalue.h | 18 +- doomsday/libs/core/include/de/data/refuge.h | 10 +- doomsday/libs/core/include/de/data/refvalue.h | 12 +- doomsday/libs/core/include/de/data/shared.h | 10 +- .../core/include/de/data/sourcelinetable.h | 8 +- doomsday/libs/core/include/de/data/string.h | 18 +- .../libs/core/include/de/data/stringpool.h | 16 +- .../libs/core/include/de/data/textvalue.h | 10 +- doomsday/libs/core/include/de/data/time.h | 14 +- .../libs/core/include/de/data/timevalue.h | 8 +- doomsday/libs/core/include/de/data/value.h | 16 +- doomsday/libs/core/include/de/data/variable.h | 24 +- .../libs/core/include/de/data/waitablefifo.h | 6 +- doomsday/libs/core/include/de/data/writer.h | 14 +- doomsday/libs/core/include/de/data/zeroed.h | 6 +- .../libs/core/include/de/data/ziparchive.h | 24 +- doomsday/libs/core/include/de/error.h | 6 +- .../include/de/filesys/archiveentryfile.h | 8 +- .../core/include/de/filesys/archivefeed.h | 12 +- .../core/include/de/filesys/archivefolder.h | 8 +- .../core/include/de/filesys/assetobserver.h | 12 +- .../core/include/de/filesys/bytearrayfile.h | 8 +- .../core/include/de/filesys/directoryfeed.h | 14 +- doomsday/libs/core/include/de/filesys/feed.h | 14 +- doomsday/libs/core/include/de/filesys/file.h | 14 +- .../libs/core/include/de/filesys/fileindex.h | 16 +- .../libs/core/include/de/filesys/filesystem.h | 20 +- .../libs/core/include/de/filesys/folder.h | 26 +- .../core/include/de/filesys/idownloadable.h | 4 +- .../core/include/de/filesys/iinterpreter.h | 6 +- .../core/include/de/filesys/libraryfile.h | 16 +- .../libs/core/include/de/filesys/linkfile.h | 10 +- .../core/include/de/filesys/metadatabank.h | 10 +- .../libs/core/include/de/filesys/nativefile.h | 10 +- .../libs/core/include/de/filesys/nativepath.h | 12 +- doomsday/libs/core/include/de/filesys/node.h | 12 +- .../libs/core/include/de/filesys/package.h | 20 +- .../core/include/de/filesys/packagefeed.h | 10 +- .../core/include/de/filesys/packageloader.h | 24 +- .../core/include/de/filesys/remote/link.h | 10 +- .../include/de/filesys/remote/nativelink.h | 10 +- .../core/include/de/filesys/remote/query.h | 10 +- .../include/de/filesys/remote/remotefeed.h | 10 +- .../de/filesys/remote/remotefeedprotocol.h | 16 +- .../de/filesys/remote/remotefeedrelay.h | 12 +- .../include/de/filesys/remote/remotefile.h | 12 +- .../include/de/filesys/remote/webhostedlink.h | 12 +- .../include/de/filesys/staticlibraryfeed.h | 6 +- doomsday/libs/core/include/de/libcore.h | 237 ++++++++--------- doomsday/libs/core/include/de/math.h | 10 +- doomsday/libs/core/include/de/net/address.h | 12 +- doomsday/libs/core/include/de/net/beacon.h | 12 +- .../libs/core/include/de/net/blockpacket.h | 8 +- .../core/include/de/net/identifiedpacket.h | 8 +- .../libs/core/include/de/net/listensocket.h | 12 +- doomsday/libs/core/include/de/net/message.h | 8 +- doomsday/libs/core/include/de/net/packet.h | 12 +- doomsday/libs/core/include/de/net/protocol.h | 14 +- .../libs/core/include/de/net/recordpacket.h | 8 +- doomsday/libs/core/include/de/net/socket.h | 22 +- .../libs/core/include/de/net/transmitter.h | 8 +- .../include/de/scriptsys/arrayexpression.h | 6 +- .../include/de/scriptsys/assignstatement.h | 8 +- .../include/de/scriptsys/builtinexpression.h | 10 +- .../include/de/scriptsys/catchstatement.h | 6 +- .../libs/core/include/de/scriptsys/compound.h | 6 +- .../include/de/scriptsys/constantexpression.h | 6 +- .../libs/core/include/de/scriptsys/context.h | 14 +- .../include/de/scriptsys/deletestatement.h | 8 +- .../de/scriptsys/dictionaryexpression.h | 6 +- .../core/include/de/scriptsys/evaluator.h | 12 +- .../core/include/de/scriptsys/expression.h | 10 +- .../de/scriptsys/expressionstatement.h | 6 +- .../core/include/de/scriptsys/flowstatement.h | 6 +- .../core/include/de/scriptsys/forstatement.h | 6 +- .../libs/core/include/de/scriptsys/function.h | 24 +- .../include/de/scriptsys/functionstatement.h | 6 +- .../core/include/de/scriptsys/functionvalue.h | 6 +- .../core/include/de/scriptsys/ifstatement.h | 6 +- .../libs/core/include/de/scriptsys/iobject.h | 8 +- .../libs/core/include/de/scriptsys/iparser.h | 6 +- doomsday/libs/core/include/de/scriptsys/lex.h | 10 +- .../libs/core/include/de/scriptsys/module.h | 6 +- .../include/de/scriptsys/nameexpression.h | 14 +- .../libs/core/include/de/scriptsys/operator.h | 6 +- .../include/de/scriptsys/operatorexpression.h | 16 +- .../libs/core/include/de/scriptsys/parser.h | 14 +- .../include/de/scriptsys/printstatement.h | 6 +- .../libs/core/include/de/scriptsys/process.h | 20 +- .../core/include/de/scriptsys/scheduler.h | 10 +- .../include/de/scriptsys/scopestatement.h | 8 +- .../libs/core/include/de/scriptsys/script.h | 8 +- .../core/include/de/scriptsys/scriptedinfo.h | 12 +- .../core/include/de/scriptsys/scriptlex.h | 16 +- .../core/include/de/scriptsys/scriptsystem.h | 12 +- .../core/include/de/scriptsys/statement.h | 8 +- .../libs/core/include/de/scriptsys/timeline.h | 14 +- .../core/include/de/scriptsys/tokenbuffer.h | 14 +- .../core/include/de/scriptsys/tokenrange.h | 14 +- .../core/include/de/scriptsys/trystatement.h | 6 +- .../include/de/scriptsys/whilestatement.h | 6 +- .../libs/core/include/de/widgets/action.h | 14 +- .../libs/core/include/de/widgets/animation.h | 12 +- .../core/include/de/widgets/animationrule.h | 8 +- .../core/include/de/widgets/animationvector.h | 10 +- .../core/include/de/widgets/constantrule.h | 8 +- .../core/include/de/widgets/indirectrule.h | 8 +- .../libs/core/include/de/widgets/isizerule.h | 8 +- .../core/include/de/widgets/operatorrule.h | 8 +- .../libs/core/include/de/widgets/rootwidget.h | 12 +- doomsday/libs/core/include/de/widgets/rule.h | 14 +- .../libs/core/include/de/widgets/rulebank.h | 4 +- .../core/include/de/widgets/rulerectangle.h | 12 +- .../libs/core/include/de/widgets/widget.h | 24 +- doomsday/libs/core/res/win32/core.rc.in | 42 +-- doomsday/libs/core/src/c_wrapper.cpp | 70 ++--- doomsday/libs/core/src/concurrency/async.cpp | 10 +- .../src/concurrency/readwritelockable.cpp | 2 +- .../libs/core/src/concurrency/taskpool.cpp | 22 +- doomsday/libs/core/src/core/app.cpp | 68 ++--- doomsday/libs/core/src/core/asset.cpp | 24 +- doomsday/libs/core/src/core/callbacktimer.h | 6 +- doomsday/libs/core/src/core/clock.cpp | 12 +- doomsday/libs/core/src/core/commandline.cpp | 24 +- doomsday/libs/core/src/core/config.cpp | 2 +- doomsday/libs/core/src/core/garbage.cpp | 20 +- .../core/src/core/highperformancetimer.cpp | 2 +- doomsday/libs/core/src/core/library.cpp | 46 ++-- doomsday/libs/core/src/core/log.cpp | 46 ++-- doomsday/libs/core/src/core/logbuffer.cpp | 40 +-- doomsday/libs/core/src/core/logfilter.cpp | 4 +- doomsday/libs/core/src/core/logsink.cpp | 2 +- doomsday/libs/core/src/core/logtextstyle.h | 6 +- doomsday/libs/core/src/core/loop.cpp | 18 +- doomsday/libs/core/src/core/memorylogsink.cpp | 16 +- .../src/core/monospacelogsinkformatter.cpp | 14 +- doomsday/libs/core/src/core/system.cpp | 2 +- doomsday/libs/core/src/core/textapp.cpp | 4 +- doomsday/libs/core/src/core/unixinfo.cpp | 2 +- doomsday/libs/core/src/data/archive.cpp | 22 +- doomsday/libs/core/src/data/arrayvalue.cpp | 4 +- doomsday/libs/core/src/data/bank.cpp | 76 +++--- doomsday/libs/core/src/data/bitfield.cpp | 14 +- .../libs/core/src/data/bitfield_elements.cpp | 10 +- doomsday/libs/core/src/data/block.cpp | 10 +- doomsday/libs/core/src/data/byteorder.cpp | 12 +- doomsday/libs/core/src/data/byterefarray.cpp | 2 +- .../libs/core/src/data/conditionaltrigger.cpp | 4 +- doomsday/libs/core/src/data/counted.cpp | 20 +- doomsday/libs/core/src/data/deletable.cpp | 2 +- .../libs/core/src/data/dictionaryvalue.cpp | 2 +- doomsday/libs/core/src/data/escapeparser.cpp | 16 +- doomsday/libs/core/src/data/gzip.cpp | 2 +- doomsday/libs/core/src/data/huffman.cpp | 6 +- doomsday/libs/core/src/data/info.cpp | 20 +- doomsday/libs/core/src/data/infobank.cpp | 4 +- doomsday/libs/core/src/data/json.cpp | 8 +- .../libs/core/src/data/nativepointervalue.cpp | 8 +- doomsday/libs/core/src/data/observers.cpp | 6 +- doomsday/libs/core/src/data/path.cpp | 102 +++---- doomsday/libs/core/src/data/pathtree.cpp | 56 ++-- doomsday/libs/core/src/data/pathtreenode.cpp | 22 +- doomsday/libs/core/src/data/pointerset.cpp | 20 +- doomsday/libs/core/src/data/profiles.cpp | 34 +-- doomsday/libs/core/src/data/reader.cpp | 10 +- doomsday/libs/core/src/data/record.cpp | 114 ++++---- .../libs/core/src/data/recordaccessor.cpp | 2 +- doomsday/libs/core/src/data/recordvalue.cpp | 14 +- doomsday/libs/core/src/data/refuge.cpp | 2 +- doomsday/libs/core/src/data/refvalue.cpp | 6 +- .../libs/core/src/data/sourcelinetable.cpp | 6 +- doomsday/libs/core/src/data/string.cpp | 6 +- doomsday/libs/core/src/data/stringpool.cpp | 78 +++--- doomsday/libs/core/src/data/time.cpp | 16 +- doomsday/libs/core/src/data/variable.cpp | 26 +- doomsday/libs/core/src/data/writer.cpp | 4 +- doomsday/libs/core/src/data/ziparchive.cpp | 8 +- .../core/src/filesys/archiveentryfile.cpp | 22 +- .../libs/core/src/filesys/archivefeed.cpp | 16 +- .../libs/core/src/filesys/archivefolder.cpp | 6 +- .../libs/core/src/filesys/assetobserver.cpp | 18 +- doomsday/libs/core/src/filesys/file.cpp | 44 ++-- doomsday/libs/core/src/filesys/fileindex.cpp | 26 +- doomsday/libs/core/src/filesys/filesystem.cpp | 20 +- doomsday/libs/core/src/filesys/folder.cpp | 62 ++--- .../libs/core/src/filesys/libraryfile.cpp | 8 +- doomsday/libs/core/src/filesys/linkfile.cpp | 18 +- .../libs/core/src/filesys/metadatabank.cpp | 12 +- doomsday/libs/core/src/filesys/nativefile.cpp | 36 +-- doomsday/libs/core/src/filesys/node.cpp | 2 +- doomsday/libs/core/src/filesys/package.cpp | 4 +- .../libs/core/src/filesys/packagefeed.cpp | 4 +- .../libs/core/src/filesys/packageloader.cpp | 37 +-- .../libs/core/src/filesys/remote/link.cpp | 10 +- .../core/src/filesys/remote/nativelink.cpp | 8 +- .../core/src/filesys/remote/remotefeed.cpp | 4 +- .../src/filesys/remote/remotefeedprotocol.cpp | 6 +- .../src/filesys/remote/remotefeedrelay.cpp | 10 +- .../core/src/filesys/remote/remotefile.cpp | 12 +- .../core/src/filesys/remote/webhostedlink.cpp | 10 +- .../core/src/filesys/staticlibraryfeed.cpp | 4 +- doomsday/libs/core/src/net/address.cpp | 2 +- doomsday/libs/core/src/net/beacon.cpp | 10 +- doomsday/libs/core/src/net/listensocket.cpp | 2 +- .../libs/core/src/net/networkinterfaces.cpp | 6 +- .../libs/core/src/net/networkinterfaces.h | 8 +- doomsday/libs/core/src/net/socket.cpp | 38 +-- .../core/src/scriptsys/assignstatement.cpp | 2 +- .../libs/core/src/scriptsys/bindings_core.cpp | 64 ++--- .../libs/core/src/scriptsys/bindings_core.h | 6 +- .../libs/core/src/scriptsys/bindings_math.cpp | 4 +- .../libs/core/src/scriptsys/bindings_math.h | 6 +- .../core/src/scriptsys/builtinexpression.cpp | 4 +- .../core/src/scriptsys/catchstatement.cpp | 2 +- .../core/src/scriptsys/constantexpression.cpp | 2 +- doomsday/libs/core/src/scriptsys/context.cpp | 16 +- .../core/src/scriptsys/deletestatement.cpp | 2 +- .../src/scriptsys/dictionaryexpression.cpp | 4 +- .../libs/core/src/scriptsys/evaluator.cpp | 20 +- doomsday/libs/core/src/scriptsys/function.cpp | 28 +- .../core/src/scriptsys/functionstatement.cpp | 2 +- .../libs/core/src/scriptsys/ifstatement.cpp | 2 +- doomsday/libs/core/src/scriptsys/lex.cpp | 2 +- .../core/src/scriptsys/nameexpression.cpp | 8 +- .../core/src/scriptsys/operatorexpression.cpp | 14 +- doomsday/libs/core/src/scriptsys/parser.cpp | 2 +- .../core/src/scriptsys/printstatement.cpp | 2 +- doomsday/libs/core/src/scriptsys/process.cpp | 20 +- .../libs/core/src/scriptsys/scheduler.cpp | 2 +- .../core/src/scriptsys/scopestatement.cpp | 2 +- doomsday/libs/core/src/scriptsys/script.cpp | 2 +- .../libs/core/src/scriptsys/scriptedinfo.cpp | 16 +- .../libs/core/src/scriptsys/scriptsystem.cpp | 30 +-- doomsday/libs/core/src/scriptsys/timeline.cpp | 6 +- .../libs/core/src/scriptsys/tokenbuffer.cpp | 10 +- .../libs/core/src/scriptsys/tokenrange.cpp | 4 +- doomsday/libs/core/src/version.cpp | 24 +- doomsday/libs/core/src/widgets/action.cpp | 8 +- doomsday/libs/core/src/widgets/animation.cpp | 8 +- .../libs/core/src/widgets/constantrule.cpp | 2 +- .../libs/core/src/widgets/indirectrule.cpp | 2 +- .../libs/core/src/widgets/operatorrule.cpp | 8 +- doomsday/libs/core/src/widgets/rootwidget.cpp | 28 +- doomsday/libs/core/src/widgets/rule.cpp | 12 +- doomsday/libs/core/src/widgets/rulebank.cpp | 2 +- .../libs/core/src/widgets/rulerectangle.cpp | 10 +- doomsday/libs/core/src/widgets/widget.cpp | 60 ++--- doomsday/libs/gui/CMakeLists.txt | 54 ++-- doomsday/libs/gui/include/de/GLWindow | 2 +- doomsday/libs/gui/include/de/audio/sound.h | 12 +- doomsday/libs/gui/include/de/audio/waveform.h | 6 +- .../libs/gui/include/de/audio/waveformbank.h | 2 +- doomsday/libs/gui/include/de/graphics/atlas.h | 8 +- .../libs/gui/include/de/graphics/colorbank.h | 2 +- .../libs/gui/include/de/graphics/drawable.h | 8 +- .../gui/include/de/graphics/glatlasbuffer.h | 2 +- .../libs/gui/include/de/graphics/glbuffer.h | 6 +- .../gui/include/de/graphics/gldrawqueue.h | 2 +- .../gui/include/de/graphics/glframebuffer.h | 4 +- .../libs/gui/include/de/graphics/glinfo.h | 10 +- .../libs/gui/include/de/graphics/glprogram.h | 6 +- .../libs/gui/include/de/graphics/glshader.h | 6 +- .../gui/include/de/graphics/glshaderbank.h | 4 +- .../libs/gui/include/de/graphics/glstate.h | 2 +- .../gui/include/de/graphics/glsubbuffer.h | 2 +- .../libs/gui/include/de/graphics/gltexture.h | 2 +- .../de/graphics/gltextureframebuffer.h | 2 +- .../libs/gui/include/de/graphics/gltimer.h | 2 +- .../libs/gui/include/de/graphics/gluniform.h | 6 +- .../libs/gui/include/de/graphics/heightmap.h | 2 +- doomsday/libs/gui/include/de/graphics/image.h | 2 +- .../libs/gui/include/de/graphics/imagebank.h | 2 +- .../libs/gui/include/de/graphics/imagefile.h | 4 +- .../de/graphics/kdtreeatlasallocator.h | 2 +- .../libs/gui/include/de/graphics/modelbank.h | 4 +- .../gui/include/de/graphics/modeldrawable.h | 14 +- .../libs/gui/include/de/graphics/multiatlas.h | 6 +- .../libs/gui/include/de/graphics/opengl.h | 16 +- .../gui/include/de/graphics/packageiconbank.h | 2 +- .../include/de/graphics/rowatlasallocator.h | 2 +- .../gui/include/de/graphics/texturebank.h | 4 +- .../gui/include/de/gui/displaymode_native.h | 6 +- doomsday/libs/gui/include/de/gui/glwindow.h | 12 +- .../libs/gui/include/de/gui/glwindow_qml.h | 14 +- doomsday/libs/gui/include/de/gui/guiapp.h | 10 +- doomsday/libs/gui/include/de/gui/guiloop.h | 2 +- doomsday/libs/gui/include/de/gui/libgui.h | 4 +- .../gui/include/de/gui/persistentglwindow.h | 8 +- .../gui/include/de/gui/windoweventhandler.h | 4 +- .../gui/include/de/input/keyeventsource.h | 4 +- .../gui/include/de/input/mouseeventsource.h | 6 +- doomsday/libs/gui/include/de/text/font.h | 6 +- doomsday/libs/gui/include/de/text/fontbank.h | 2 +- .../libs/gui/include/de/text/nativefont.h | 2 +- doomsday/libs/gui/src/audio/sound.cpp | 20 +- doomsday/libs/gui/src/audio/waveform.cpp | 4 +- doomsday/libs/gui/src/audio/waveformbank.cpp | 2 +- doomsday/libs/gui/src/displaymode.cpp | 8 +- doomsday/libs/gui/src/displaymode_dummy.cpp | 14 +- doomsday/libs/gui/src/glwindow.cpp | 66 +++-- doomsday/libs/gui/src/glwindow_qml.cpp | 4 +- doomsday/libs/gui/src/graphics/atlas.cpp | 58 ++-- .../libs/gui/src/graphics/atlastexture.cpp | 2 +- doomsday/libs/gui/src/graphics/colorbank.cpp | 2 +- doomsday/libs/gui/src/graphics/drawable.cpp | 26 +- .../libs/gui/src/graphics/glatlasbuffer.cpp | 16 +- doomsday/libs/gui/src/graphics/glbuffer.cpp | 64 ++--- .../libs/gui/src/graphics/gldrawqueue.cpp | 14 +- .../libs/gui/src/graphics/glframebuffer.cpp | 60 ++--- .../glframebuffer_alternativebuffer.cpp | 6 +- doomsday/libs/gui/src/graphics/glinfo.cpp | 68 ++--- doomsday/libs/gui/src/graphics/glprogram.cpp | 32 +-- doomsday/libs/gui/src/graphics/glshader.cpp | 44 ++-- .../libs/gui/src/graphics/glshaderbank.cpp | 2 +- doomsday/libs/gui/src/graphics/glstate.cpp | 26 +- .../libs/gui/src/graphics/glsubbuffer.cpp | 6 +- doomsday/libs/gui/src/graphics/gltexture.cpp | 2 +- .../gui/src/graphics/gltextureframebuffer.cpp | 10 +- doomsday/libs/gui/src/graphics/gltimer.cpp | 4 +- doomsday/libs/gui/src/graphics/gluniform.cpp | 98 +++---- doomsday/libs/gui/src/graphics/heightmap.cpp | 2 +- doomsday/libs/gui/src/graphics/image.cpp | 18 +- doomsday/libs/gui/src/graphics/imagebank.cpp | 2 +- doomsday/libs/gui/src/graphics/imagefile.cpp | 6 +- .../gui/src/graphics/kdtreeatlasallocator.cpp | 10 +- doomsday/libs/gui/src/graphics/modelbank.cpp | 2 +- .../libs/gui/src/graphics/modeldrawable.cpp | 64 ++--- doomsday/libs/gui/src/graphics/multiatlas.cpp | 14 +- .../libs/gui/src/graphics/packageiconbank.cpp | 4 +- .../gui/src/graphics/rowatlasallocator.cpp | 54 ++-- .../libs/gui/src/graphics/texturebank.cpp | 4 +- doomsday/libs/gui/src/guiapp.cpp | 16 +- doomsday/libs/gui/src/guiloop.cpp | 2 +- doomsday/libs/gui/src/input/keyevent.cpp | 4 +- .../libs/gui/src/input/keyeventsource.cpp | 6 +- .../libs/gui/src/input/mouseeventsource.cpp | 10 +- doomsday/libs/gui/src/persistentglwindow.cpp | 30 +-- .../gui/src/text/coretextnativefont_macx.cpp | 18 +- .../gui/src/text/coretextnativefont_macx.h | 2 +- doomsday/libs/gui/src/text/font.cpp | 2 +- .../libs/gui/src/text/font_richformat.cpp | 18 +- doomsday/libs/gui/src/text/fontbank.cpp | 2 +- doomsday/libs/gui/src/text/nativefont.cpp | 2 +- doomsday/libs/gui/src/text/qtnativefont.cpp | 2 +- doomsday/libs/gui/src/text/qtnativefont.h | 2 +- doomsday/libs/gui/src/windoweventhandler.cpp | 28 +- doomsday/libs/legacy/CMakeLists.txt | 14 +- doomsday/libs/legacy/include/de/aabox.h | 12 +- doomsday/libs/legacy/include/de/animator.h | 30 +-- doomsday/libs/legacy/include/de/binangle.h | 6 +- doomsday/libs/legacy/include/de/concurrency.h | 54 ++-- doomsday/libs/legacy/include/de/findfile.h | 16 +- doomsday/libs/legacy/include/de/fixedpoint.h | 18 +- doomsday/libs/legacy/include/de/liblegacy.h | 76 +++--- doomsday/libs/legacy/include/de/mathutil.h | 76 +++--- doomsday/libs/legacy/include/de/memory.h | 18 +- .../libs/legacy/include/de/memoryblockset.h | 14 +- doomsday/libs/legacy/include/de/memoryzone.h | 58 ++-- doomsday/libs/legacy/include/de/nodepile.h | 14 +- doomsday/libs/legacy/include/de/point.h | 158 +++++------ doomsday/libs/legacy/include/de/reader.h | 44 ++-- doomsday/libs/legacy/include/de/rect.h | 150 +++++------ doomsday/libs/legacy/include/de/size.h | 62 ++--- doomsday/libs/legacy/include/de/smoother.h | 28 +- doomsday/libs/legacy/include/de/stack.h | 16 +- doomsday/libs/legacy/include/de/str.h | 116 ++++---- doomsday/libs/legacy/include/de/str.hh | 6 +- doomsday/libs/legacy/include/de/stringarray.h | 40 +-- doomsday/libs/legacy/include/de/strutil.h | 48 ++-- doomsday/libs/legacy/include/de/texgamma.h | 10 +- doomsday/libs/legacy/include/de/timer.h | 20 +- doomsday/libs/legacy/include/de/types.h | 6 +- doomsday/libs/legacy/include/de/unittest.h | 12 +- doomsday/libs/legacy/include/de/vector1.h | 248 +++++++++--------- doomsday/libs/legacy/include/de/writer.h | 48 ++-- doomsday/libs/legacy/src/animator.c | 24 +- doomsday/libs/legacy/src/binangle.c | 2 +- doomsday/libs/legacy/src/concurrency.cpp | 14 +- doomsday/libs/legacy/src/findfile_windows.cpp | 4 +- doomsday/libs/legacy/src/fixedpoint.c | 2 +- doomsday/libs/legacy/src/memoryblockset.c | 12 +- doomsday/libs/legacy/src/memoryzone.c | 54 ++-- doomsday/libs/legacy/src/memoryzone_private.h | 16 +- doomsday/libs/legacy/src/nodepile.c | 2 +- doomsday/libs/legacy/src/point.c | 136 +++++----- doomsday/libs/legacy/src/reader1.c | 12 +- doomsday/libs/legacy/src/rect.c | 122 ++++----- doomsday/libs/legacy/src/size.c | 48 ++-- doomsday/libs/legacy/src/smoother.cpp | 24 +- doomsday/libs/legacy/src/stack.c | 2 +- doomsday/libs/legacy/src/str.c | 92 +++---- doomsday/libs/legacy/src/stringarray.cpp | 2 +- doomsday/libs/legacy/src/strutil.c | 4 +- doomsday/libs/legacy/src/writer1.c | 10 +- doomsday/libs/shell/CMakeLists.txt | 2 +- .../include/de/shell/abstractlineeditor.h | 2 +- .../shell/include/de/shell/abstractlink.h | 2 +- .../shell/include/de/shell/choicewidget.h | 2 +- .../include/de/shell/commandlinewidget.h | 2 +- .../shell/include/de/shell/dialogwidget.h | 2 +- .../shell/include/de/shell/editorhistory.h | 2 +- .../libs/shell/include/de/shell/inputdialog.h | 2 +- .../libs/shell/include/de/shell/labelwidget.h | 2 +- .../libs/shell/include/de/shell/lexicon.h | 2 +- .../shell/include/de/shell/lineeditwidget.h | 2 +- doomsday/libs/shell/include/de/shell/link.h | 4 +- .../libs/shell/include/de/shell/localserver.h | 8 +- .../libs/shell/include/de/shell/logwidget.h | 2 +- .../libs/shell/include/de/shell/menuwidget.h | 2 +- .../include/de/shell/packagedownloader.h | 4 +- .../libs/shell/include/de/shell/protocol.h | 6 +- .../shell/include/de/shell/serverfinder.h | 4 +- .../libs/shell/include/de/shell/textcanvas.h | 2 +- .../libs/shell/include/de/shell/textwidget.h | 2 +- .../libs/shell/src/abstractlineeditor.cpp | 6 +- doomsday/libs/shell/src/abstractlink.cpp | 4 +- doomsday/libs/shell/src/choicewidget.cpp | 6 +- doomsday/libs/shell/src/commandlinewidget.cpp | 4 +- doomsday/libs/shell/src/dialogwidget.cpp | 4 +- doomsday/libs/shell/src/editorhistory.cpp | 12 +- doomsday/libs/shell/src/inputdialog.cpp | 2 +- doomsday/libs/shell/src/labelwidget.cpp | 4 +- doomsday/libs/shell/src/lexicon.cpp | 2 +- doomsday/libs/shell/src/lineeditwidget.cpp | 4 +- doomsday/libs/shell/src/link.cpp | 2 +- doomsday/libs/shell/src/localserver.cpp | 6 +- doomsday/libs/shell/src/logwidget.cpp | 4 +- doomsday/libs/shell/src/menuwidget.cpp | 6 +- doomsday/libs/shell/src/packagedownloader.cpp | 26 +- doomsday/libs/shell/src/protocol.cpp | 24 +- doomsday/libs/shell/src/serverfinder.cpp | 2 +- doomsday/libs/shell/src/textcanvas.cpp | 2 +- doomsday/libs/shell/src/textrootwidget.cpp | 2 +- doomsday/libs/shell/src/textwidget.cpp | 8 +- doomsday/sdk.doxy | 18 +- doomsday/tests/CMakeLists.txt | 6 +- doomsday/tests/test_appfw/CMakeLists.txt | 2 +- doomsday/tests/test_appfw/README.md | 2 +- .../shaders/fx-blur.dei | 28 +- .../shaders/generic.dei | 78 +++--- .../shaders/ui.dei | 44 ++-- .../tests/test_appfw/src/approotwidget.cpp | 2 +- doomsday/tests/test_appfw/src/approotwidget.h | 2 +- .../tests/test_appfw/src/appwindowsystem.cpp | 2 +- .../tests/test_appfw/src/appwindowsystem.h | 2 +- .../tests/test_appfw/src/globalshortcuts.cpp | 2 +- .../tests/test_appfw/src/globalshortcuts.h | 2 +- doomsday/tests/test_appfw/src/main.cpp | 4 +- doomsday/tests/test_appfw/src/mainwindow.cpp | 12 +- doomsday/tests/test_appfw/src/mainwindow.h | 2 +- doomsday/tests/test_appfw/src/testapp.cpp | 6 +- doomsday/tests/test_appfw/src/testapp.h | 2 +- doomsday/tests/test_archive/CMakeLists.txt | 4 +- doomsday/tests/test_archive/main.cpp | 4 +- doomsday/tests/test_bitfield/CMakeLists.txt | 2 +- doomsday/tests/test_bitfield/main.cpp | 2 +- .../tests/test_commandline/CMakeLists.txt | 2 +- doomsday/tests/test_glsandbox/CMakeLists.txt | 2 +- doomsday/tests/test_glsandbox/testwindow.cpp | 12 +- doomsday/tests/test_glsandbox/testwindow.h | 2 +- doomsday/tests/test_info/CMakeLists.txt | 4 +- doomsday/tests/test_log/CMakeLists.txt | 2 +- doomsday/tests/test_pointerset/CMakeLists.txt | 2 +- doomsday/tests/test_record/CMakeLists.txt | 2 +- doomsday/tests/test_record/main.cpp | 4 +- doomsday/tests/test_script/CMakeLists.txt | 4 +- doomsday/tests/test_string/CMakeLists.txt | 2 +- doomsday/tests/test_stringpool/CMakeLists.txt | 2 +- doomsday/tests/test_stringpool/main.cpp | 48 ++-- doomsday/tests/test_vectors/CMakeLists.txt | 2 +- doomsday/tools/CMakeLists.txt | 2 +- doomsday/tools/doomsdayscript/CMakeLists.txt | 2 +- doomsday/tools/md2tool/CMakeLists.txt | 2 +- doomsday/tools/savegametool/CMakeLists.txt | 2 +- .../tools/savegametool/src/id1translator.cpp | 18 +- .../tools/savegametool/src/id1translator.h | 4 +- doomsday/tools/savegametool/src/main.cpp | 10 +- .../savegametool/src/nativetranslator.cpp | 42 +-- .../tools/savegametool/src/nativetranslator.h | 4 +- .../tools/savegametool/src/packageformatter.h | 6 +- doomsday/tools/shell-text/CMakeLists.txt | 6 +- doomsday/tools/shell-text/src/cursesapp.cpp | 2 +- doomsday/tools/shell-text/src/cursesapp.h | 2 +- .../tools/shell-text/src/cursestextcanvas.cpp | 2 +- .../tools/shell-text/src/cursestextcanvas.h | 2 +- .../shell-text/src/localserverdialog.cpp | 2 +- .../tools/shell-text/src/localserverdialog.h | 2 +- doomsday/tools/shell-text/src/main.cpp | 4 +- doomsday/tools/shell-text/src/shellapp.cpp | 4 +- doomsday/tools/shell-text/src/shellapp.h | 2 +- .../tools/shell-text/src/statuswidget.cpp | 2 +- doomsday/tools/shell-text/src/statuswidget.h | 2 +- doomsday/tools/shell/CMakeLists.txt | 6 +- .../tools/shell/doomsday-shell.desktop.in | 3 +- doomsday/tools/shell/src/errorlogdialog.cpp | 2 +- doomsday/tools/shell/src/errorlogdialog.h | 2 +- doomsday/tools/shell/src/folderselection.cpp | 2 +- doomsday/tools/shell/src/folderselection.h | 2 +- doomsday/tools/shell/src/guishellapp.cpp | 2 +- doomsday/tools/shell/src/guishellapp.h | 2 +- doomsday/tools/shell/src/linkwindow.cpp | 6 +- doomsday/tools/shell/src/linkwindow.h | 2 +- .../tools/shell/src/localserverdialog.cpp | 2 +- doomsday/tools/shell/src/localserverdialog.h | 2 +- doomsday/tools/shell/src/opendialog.cpp | 2 +- doomsday/tools/shell/src/opendialog.h | 2 +- doomsday/tools/shell/src/optionspage.cpp | 2 +- doomsday/tools/shell/src/optionspage.h | 2 +- doomsday/tools/shell/src/preferences.cpp | 2 +- doomsday/tools/shell/src/preferences.h | 2 +- doomsday/tools/shell/src/qtguiapp.cpp | 2 +- doomsday/tools/shell/src/qtguiapp.h | 2 +- doomsday/tools/shell/src/qtrootwidget.cpp | 6 +- doomsday/tools/shell/src/qtrootwidget.h | 2 +- doomsday/tools/shell/src/qttextcanvas.cpp | 6 +- doomsday/tools/shell/src/qttextcanvas.h | 2 +- doomsday/tools/shell/src/statuswidget.cpp | 4 +- doomsday/tools/shell/src/statuswidget.h | 2 +- doomsday/tools/texc/CMakeLists.txt | 4 +- doomsday/tools/wadtool/CMakeLists.txt | 2 +- doomsday/xcode/Doomsday/Info.plist | 2 +- 1854 files changed, 11686 insertions(+), 11654 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3cca7fef54..5a561a2e4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ before_script: script: - source /opt/qt55/bin/qt55-env.sh - - cd build-travis && cmake -DQMAKE=/opt/qt55/bin/qmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDENG_ENABLE_TESTS=ON ../doomsday && make -j4 + - cd build-travis && cmake -DQMAKE=/opt/qt55/bin/qmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDE_ENABLE_TESTS=ON ../doomsday && make -j4 notifications: slack: dengteam:A4Hl4awsyxNxQG61rrWgDuHo diff --git a/appveyor.yml b/appveyor.yml index 2bb72e7c85..5e41b56f1d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,7 +10,7 @@ before_build: - 7z x deps.7z - md build-ci - cd build-ci - - cmake -G "Visual Studio 15 2017" -DQMAKE=C:\Qt\5.6\msvc2015\bin\qmake.exe -DDENG_ENABLE_TESTS=ON -DDENG_ENABLE_TURBO=ON ..\doomsday + - cmake -G "Visual Studio 15 2017" -DQMAKE=C:\Qt\5.6\msvc2015\bin\qmake.exe -DDE_ENABLE_TESTS=ON -DDE_ENABLE_TURBO=ON ..\doomsday build: parallel: true verbosity: minimal diff --git a/doomsday/CMakeLists.txt b/doomsday/CMakeLists.txt index f18e93cab7..6bcb8288c7 100644 --- a/doomsday/CMakeLists.txt +++ b/doomsday/CMakeLists.txt @@ -9,7 +9,7 @@ include (cmake/Config.cmake) add_subdirectory (libs) add_subdirectory (apps) if (NOT IOS) - if (DENG_ENABLE_TOOLS) + if (DE_ENABLE_TOOLS) add_subdirectory (tools) endif () add_subdirectory (tests) diff --git a/doomsday/apps/CMakeLists.txt b/doomsday/apps/CMakeLists.txt index c1ecaa3329..285073bec9 100644 --- a/doomsday/apps/CMakeLists.txt +++ b/doomsday/apps/CMakeLists.txt @@ -6,10 +6,10 @@ include (../cmake/Config.cmake) add_subdirectory (libdoomsday) add_subdirectory (plugins) -if (DENG_ENABLE_SERVER AND NOT IOS) +if (DE_ENABLE_SERVER AND NOT IOS) add_subdirectory (server) endif () -if (DENG_ENABLE_GUI) +if (DE_ENABLE_GUI) add_subdirectory (gloom) add_subdirectory (client) endif () diff --git a/doomsday/apps/api/api_audiod.h b/doomsday/apps/api/api_audiod.h index 9a10c4480d..b66f3536be 100644 --- a/doomsday/apps/api/api_audiod.h +++ b/doomsday/apps/api/api_audiod.h @@ -20,8 +20,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_AUDIO_DRIVER_INTERFACE_H -#define LIBDENG_AUDIO_DRIVER_INTERFACE_H +#ifndef DE_AUDIO_DRIVER_INTERFACE_H +#define DE_AUDIO_DRIVER_INTERFACE_H /** * @defgroup audio Audio @@ -74,4 +74,4 @@ typedef struct audiointerface_base_s { ///@} -#endif /* LIBDENG_AUDIO_DRIVER_INTERFACE_H */ +#endif /* DE_AUDIO_DRIVER_INTERFACE_H */ diff --git a/doomsday/apps/api/api_base.h b/doomsday/apps/api/api_base.h index be3574ec1a..2c94ef4de1 100644 --- a/doomsday/apps/api/api_base.h +++ b/doomsday/apps/api/api_base.h @@ -43,7 +43,7 @@ typedef struct gameinfo_s { /// @} // The Base API. -DENG_API_TYPEDEF(Base) +DE_API_TYPEDEF(Base) { de_api_t api; @@ -127,9 +127,9 @@ DENG_API_TYPEDEF(Base) */ void (*SetupMap)(int mode, int flags); } -DENG_API_T(Base); +DE_API_T(Base); -#ifndef DENG_NO_API_MACROS_BASE +#ifndef DE_NO_API_MACROS_BASE #define Sys_Quit _api_Base.Quit #define DD_GetInteger _api_Base.GetInteger #define DD_SetInteger _api_Base.SetInteger @@ -145,7 +145,7 @@ DENG_API_T(Base); #endif #ifdef __DOOMSDAY__ -DENG_USING_API(Base); +DE_USING_API(Base); #endif #endif // DOOMSDAY_API_BASE_H diff --git a/doomsday/apps/api/api_busy.h b/doomsday/apps/api/api_busy.h index 0e2c9028f5..9f4dd6c6f8 100644 --- a/doomsday/apps/api/api_busy.h +++ b/doomsday/apps/api/api_busy.h @@ -24,20 +24,20 @@ #include "api_base.h" -DENG_API_TYPEDEF(Busy) +DE_API_TYPEDEF(Busy) { de_api_t api; void (*FreezeGameForBusyMode)(void); } -DENG_API_T(Busy); +DE_API_T(Busy); -#ifndef DENG_NO_API_MACROS_BUSY +#ifndef DE_NO_API_MACROS_BUSY #define BusyMode_FreezeGameForBusyMode _api_Busy.FreezeGameForBusyMode #endif #ifdef __DOOMSDAY__ -DENG_USING_API(Busy); +DE_USING_API(Busy); #endif #endif /* DOOMSDAY_API_BUSY_H */ diff --git a/doomsday/apps/api/api_client.h b/doomsday/apps/api/api_client.h index 1b2c387464..ab1133791d 100644 --- a/doomsday/apps/api/api_client.h +++ b/doomsday/apps/api/api_client.h @@ -5,7 +5,7 @@ struct mobj_s; -DENG_API_TYPEDEF(Client) +DE_API_TYPEDEF(Client) { de_api_t api; @@ -51,9 +51,9 @@ DENG_API_TYPEDEF(Client) */ struct mobj_s* (*Mobj_PlayerMobj)(int plrNum); } -DENG_API_T(Client); +DE_API_T(Client); -#ifndef DENG_NO_API_MACROS_CLIENT +#ifndef DE_NO_API_MACROS_CLIENT #define ClMobj_Find _api_Client.Mobj_Find #define ClMobj_EnableLocalActions _api_Client.Mobj_EnableLocalActions #define ClMobj_LocalActionsEnabled _api_Client.Mobj_LocalActionsEnabled @@ -62,7 +62,7 @@ DENG_API_T(Client); #endif #ifdef __DOOMSDAY__ -DENG_USING_API(Client); +DE_USING_API(Client); #endif #endif // DOOMSDAY_API_CLIENT_H diff --git a/doomsday/apps/api/api_console.h b/doomsday/apps/api/api_console.h index dc8b60c361..d945f66add 100644 --- a/doomsday/apps/api/api_console.h +++ b/doomsday/apps/api/api_console.h @@ -27,7 +27,7 @@ /// @addtogroup console ///@{ -DENG_API_TYPEDEF(Con) +DE_API_TYPEDEF(Con) { de_api_t api; @@ -75,9 +75,9 @@ DENG_API_TYPEDEF(Con) int (*Execute)(int silent, char const* command); int (*Executef)(int silent, char const* command, ...); } -DENG_API_T(Con); +DE_API_T(Con); -#ifndef DENG_NO_API_MACROS_CONSOLE +#ifndef DE_NO_API_MACROS_CONSOLE #define Con_Open _api_Con.Open #define Con_AddCommand _api_Con.AddCommand #define Con_AddVariable _api_Con.AddVariable @@ -111,7 +111,7 @@ DENG_API_T(Con); #endif #ifdef __DOOMSDAY__ -DENG_USING_API(Con); +DE_USING_API(Con); #endif ///@} diff --git a/doomsday/apps/api/api_def.h b/doomsday/apps/api/api_def.h index 6187ad03ce..9498605053 100644 --- a/doomsday/apps/api/api_def.h +++ b/doomsday/apps/api/api_def.h @@ -27,7 +27,7 @@ /// @addtogroup defs ///@{ -DENG_API_TYPEDEF(Def) // v2 +DE_API_TYPEDEF(Def) // v2 { de_api_t api; @@ -35,16 +35,16 @@ DENG_API_TYPEDEF(Def) // v2 int (*_Set)(int type, int index, int value, void const *ptr); int (*EvalFlags)(char const *flags); } -DENG_API_T(Def); +DE_API_T(Def); -#ifndef DENG_NO_API_MACROS_DEFINITIONS +#ifndef DE_NO_API_MACROS_DEFINITIONS #define Def_Get _api_Def._Get #define Def_Set _api_Def._Set #define Def_EvalFlags _api_Def.EvalFlags #endif #ifdef __DOOMSDAY__ -DENG_USING_API(Def); +DE_USING_API(Def); #endif ///@} diff --git a/doomsday/apps/api/api_event.h b/doomsday/apps/api/api_event.h index 1478e12dfd..dde6b31bef 100644 --- a/doomsday/apps/api/api_event.h +++ b/doomsday/apps/api/api_event.h @@ -70,7 +70,7 @@ typedef struct event_s { /// @addtogroup bindings ///@{ -DENG_API_TYPEDEF(B) +DE_API_TYPEDEF(B) { de_api_t api; @@ -110,9 +110,9 @@ DENG_API_TYPEDEF(B) */ int (*GetKeyCode)(const char* name); } -DENG_API_T(B); +DE_API_T(B); -#ifndef DENG_NO_API_MACROS_BINDING +#ifndef DE_NO_API_MACROS_BINDING #define B_SetContextFallback _api_B.SetContextFallback #define B_BindingsForCommand _api_B.BindingsForCommand #define B_BindingsForControl _api_B.BindingsForControl @@ -120,7 +120,7 @@ DENG_API_T(B); #endif #ifdef __DOOMSDAY__ -DENG_USING_API(B); +DE_USING_API(B); #endif ///@} diff --git a/doomsday/apps/api/api_filesys.h b/doomsday/apps/api/api_filesys.h index 0e8a046222..0932969d2a 100644 --- a/doomsday/apps/api/api_filesys.h +++ b/doomsday/apps/api/api_filesys.h @@ -25,7 +25,7 @@ #include #include "api_base.h" -DENG_API_TYPEDEF(F) +DE_API_TYPEDEF(F) { de_api_t api; @@ -71,9 +71,9 @@ DENG_API_TYPEDEF(F) */ void const* (*LumpIndex)(); } -DENG_API_T(F); +DE_API_T(F); -#ifndef DENG_NO_API_MACROS_FILESYS +#ifndef DE_NO_API_MACROS_FILESYS #define F_Access _api_F.Access #define F_FileExists _api_F.FileExists #define F_MakePath _api_F.MakePath @@ -84,7 +84,7 @@ DENG_API_T(F); #endif #ifdef __DOOMSDAY__ -DENG_USING_API(F); +DE_USING_API(F); #endif #endif // DOOMSDAY_API_FILE_H diff --git a/doomsday/apps/api/api_fontrender.h b/doomsday/apps/api/api_fontrender.h index f6d7c08293..bb7d2bbf3e 100644 --- a/doomsday/apps/api/api_fontrender.h +++ b/doomsday/apps/api/api_fontrender.h @@ -20,8 +20,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_API_FONT_RENDERER_H -#define LIBDENG_API_FONT_RENDERER_H +#ifndef DE_API_FONT_RENDERER_H +#define DE_API_FONT_RENDERER_H #include "api_base.h" @@ -63,7 +63,7 @@ extern "C" { #define DTF_ONLY_SHADOW (DTF_NO_TYPEIN|DTF_NO_GLITTER) /*@}*/ -DENG_API_TYPEDEF(FR) +DE_API_TYPEDEF(FR) { de_api_t api; @@ -246,9 +246,9 @@ DENG_API_TYPEDEF(FR) void (*ResetTypeinTimer)(void); } -DENG_API_T(FR); +DE_API_T(FR); -#ifndef DENG_NO_API_MACROS_FONT_RENDER +#ifndef DE_NO_API_MACROS_FONT_RENDER #define Fonts_ResolveUri _api_FR.ResolveUri #define FR_Font _api_FR.Font #define FR_SetFont _api_FR.SetFont @@ -302,11 +302,11 @@ DENG_API_T(FR); #endif #if defined __DOOMSDAY__ && defined __CLIENT__ -DENG_USING_API(FR); +DE_USING_API(FR); #endif #ifdef __cplusplus } // extern "C" #endif -#endif /* LIBDENG_API_FONT_RENDERER_H */ +#endif /* DE_API_FONT_RENDERER_H */ diff --git a/doomsday/apps/api/api_gl.h b/doomsday/apps/api/api_gl.h index 89f3db8bcf..38f619ddee 100644 --- a/doomsday/apps/api/api_gl.h +++ b/doomsday/apps/api/api_gl.h @@ -252,7 +252,7 @@ typedef struct { float scaleFactor; } dgl_borderedprojectionstate_t; -DENG_API_TYPEDEF(GL) +DE_API_TYPEDEF(GL) { de_api_t api; @@ -375,9 +375,9 @@ DENG_API_TYPEDEF(GL) */ void (*ResetViewEffects)(); } -DENG_API_T(GL); +DE_API_T(GL); -#ifndef DENG_NO_API_MACROS_GL +#ifndef DE_NO_API_MACROS_GL #define DGL_Enable _api_GL.Enable #define DGL_Disable _api_GL.Disable #define DGL_PushState _api_GL.PushState @@ -455,7 +455,7 @@ DENG_API_T(GL); #endif #if defined __DOOMSDAY__ && defined __CLIENT__ -DENG_USING_API(GL); +DE_USING_API(GL); #endif ///@} diff --git a/doomsday/apps/api/api_infine.h b/doomsday/apps/api/api_infine.h index 373930324b..038c81c0f8 100644 --- a/doomsday/apps/api/api_infine.h +++ b/doomsday/apps/api/api_infine.h @@ -52,7 +52,7 @@ typedef ident_t fi_objectid_t; #define FF_LOCAL 0x1 ///< Local scripts are executed client-side. ///@} -DENG_API_TYPEDEF(Infine) +DE_API_TYPEDEF(Infine) { de_api_t api; @@ -120,9 +120,9 @@ DENG_API_TYPEDEF(Infine) int (*ScriptResponder)(finaleid_t id, const void* ev); } -DENG_API_T(Infine); +DE_API_T(Infine); -#ifndef DENG_NO_API_MACROS_INFINE +#ifndef DE_NO_API_MACROS_INFINE #define FI_Execute2 _api_Infine.Execute2 #define FI_Execute _api_Infine.Execute #define FI_ScriptActive _api_Infine.ScriptActive @@ -138,7 +138,7 @@ DENG_API_T(Infine); #endif #ifdef __DOOMSDAY__ -DENG_USING_API(Infine); +DE_USING_API(Infine); #endif ///@} diff --git a/doomsday/apps/api/api_internaldata.h b/doomsday/apps/api/api_internaldata.h index 72cc3f0a43..571bf40899 100644 --- a/doomsday/apps/api/api_internaldata.h +++ b/doomsday/apps/api/api_internaldata.h @@ -29,7 +29,7 @@ * * @deprecated Avoid this API. */ -DENG_API_TYPEDEF(InternalData) +DE_API_TYPEDEF(InternalData) { de_api_t api; @@ -41,10 +41,10 @@ DENG_API_TYPEDEF(InternalData) // General information. int *validCount; } -DENG_API_T(InternalData); +DE_API_T(InternalData); #ifdef __DOOMSDAY__ -DENG_USING_API(InternalData); +DE_USING_API(InternalData); #endif #endif // DOOMSDAY_API_INTERNALDATA_H diff --git a/doomsday/apps/api/api_map.h b/doomsday/apps/api/api_map.h index 1def13fa77..0bbd70ca21 100644 --- a/doomsday/apps/api/api_map.h +++ b/doomsday/apps/api/api_map.h @@ -92,10 +92,10 @@ * For example, a game could use Sector to identify to sector to * change with the Map Update API. * - * Define @c DENG_INTERNAL_DATA_ACCESS if access to the internal map data + * Define @c DE_INTERNAL_DATA_ACCESS if access to the internal map data * structures is needed. */ -#if !defined __DOOMSDAY__ && !defined DENG_INTERNAL_DATA_ACCESS +#if !defined __DOOMSDAY__ && !defined DE_INTERNAL_DATA_ACCESS // Opaque types for public use. struct convexsubspace_s; @@ -231,7 +231,7 @@ extern "C" { /// @addtogroup world ///@{ -DENG_API_TYPEDEF(Map) +DE_API_TYPEDEF(Map) { de_api_t api; @@ -676,9 +676,9 @@ DENG_API_TYPEDEF(Map) void (*GetDoublepv)(MapElementPtr ptr, uint prop, double *params); void (*GetPtrpv)(MapElementPtr ptr, uint prop, void *params); } -DENG_API_T(Map); +DE_API_T(Map); -#ifndef DENG_NO_API_MACROS_MAP +#ifndef DE_NO_API_MACROS_MAP #define P_MapExists _api_Map.Exists #define P_MapIsCustom _api_Map.IsCustom #define P_MapSourceFile _api_Map.SourceFile @@ -810,7 +810,7 @@ DENG_API_T(Map); #endif #ifdef __DOOMSDAY__ -DENG_USING_API(Map); +DE_USING_API(Map); #endif ///@} diff --git a/doomsday/apps/api/api_mapedit.h b/doomsday/apps/api/api_mapedit.h index 91ac186495..ebd98e2c32 100644 --- a/doomsday/apps/api/api_mapedit.h +++ b/doomsday/apps/api/api_mapedit.h @@ -30,7 +30,7 @@ /// @ingroup world ///@{ -DENG_API_TYPEDEF(MPE) +DE_API_TYPEDEF(MPE) { de_api_t api; @@ -105,9 +105,9 @@ DENG_API_TYPEDEF(MPE) int (*PolyobjCreate)(int const *lines, int linecount, int tag, int sequenceType, coord_t originX, coord_t originY, int archiveIndex); dd_bool (*GameObjProperty)(char const *objName, int idx, char const *propName, valuetype_t type, void *data); } -DENG_API_T(MPE); +DE_API_T(MPE); -#ifndef DENG_NO_API_MACROS_MAP_EDIT +#ifndef DE_NO_API_MACROS_MAP_EDIT //#define P_RegisterMapObj _api_MPE.RegisterMapObj //#define P_RegisterMapObjProperty _api_MPE.RegisterMapObjProperty #define MPE_Begin _api_MPE.Begin @@ -123,7 +123,7 @@ DENG_API_T(MPE); #endif #ifdef __DOOMSDAY__ -DENG_USING_API(MPE); +DE_USING_API(MPE); #endif ///@} diff --git a/doomsday/apps/api/api_material.h b/doomsday/apps/api/api_material.h index 29a532e087..2588d85ff9 100644 --- a/doomsday/apps/api/api_material.h +++ b/doomsday/apps/api/api_material.h @@ -31,7 +31,7 @@ */ ///@{ -DENG_API_TYPEDEF(Material) +DE_API_TYPEDEF(Material) { de_api_t api; @@ -41,9 +41,9 @@ DENG_API_TYPEDEF(Material) materialid_t (*ResolveUriCString)(char const *path); } -DENG_API_T(Material); +DE_API_T(Material); -#ifndef DENG_NO_API_MACROS_MATERIALS +#ifndef DE_NO_API_MACROS_MATERIALS #define DD_MaterialForTextureUri _api_Material.ForTextureUri #define Materials_ComposeUri _api_Material.ComposeUri #define Materials_ResolveUri _api_Material.ResolveUri @@ -51,7 +51,7 @@ DENG_API_T(Material); #endif #ifdef __DOOMSDAY__ -DENG_USING_API(Material); +DE_USING_API(Material); #endif ///@} diff --git a/doomsday/apps/api/api_player.h b/doomsday/apps/api/api_player.h index 485a57e144..68db20aeb7 100644 --- a/doomsday/apps/api/api_player.h +++ b/doomsday/apps/api/api_player.h @@ -85,7 +85,7 @@ typedef impulsetype_t controltype_t; #define DDPF_UNDEFINED_WEAPON 0x4000 ///< Weapon of the player is undefined (not sent yet). ///@} -DENG_API_TYPEDEF(Player) +DE_API_TYPEDEF(Player) { de_api_t api; @@ -159,9 +159,9 @@ DENG_API_TYPEDEF(Player) */ void (*Impulse)(int playerNum, int impulseId); } -DENG_API_T(Player); +DE_API_T(Player); -#ifndef DENG_NO_API_MACROS_PLAYER +#ifndef DE_NO_API_MACROS_PLAYER #define Net_GetPlayerName _api_Player.GetPlayerName #define Net_GetPlayerID _api_Player.GetPlayerID #define Net_PlayerSmoother _api_Player.GetSmoother @@ -174,7 +174,7 @@ DENG_API_T(Player); #endif #ifdef __DOOMSDAY__ -DENG_USING_API(Player); +DE_USING_API(Player); #endif #endif // DOOMSDAY_API_PLAYER_H diff --git a/doomsday/apps/api/api_render.h b/doomsday/apps/api/api_render.h index 6f47b7feea..2e65650237 100644 --- a/doomsday/apps/api/api_render.h +++ b/doomsday/apps/api/api_render.h @@ -25,7 +25,7 @@ #include "api_gl.h" #include "dd_share.h" -DENG_API_TYPEDEF(Rend) +DE_API_TYPEDEF(Rend) { de_api_t api; @@ -149,9 +149,9 @@ DENG_API_TYPEDEF(Rend) */ int (*ScreenShot)(const char* filename, int flags); } -DENG_API_T(Rend); +DE_API_T(Rend); -#ifndef DENG_NO_API_MACROS_RENDER +#ifndef DE_NO_API_MACROS_RENDER #define R_SetupFogDefaults _api_Rend.SetupFogDefaults #define R_SetupFog _api_Rend.SetupFog #define Rend_CacheForMobjType _api_Rend.CacheForMobjType @@ -178,7 +178,7 @@ DENG_API_T(Rend); #endif #if defined __DOOMSDAY__ && defined __CLIENT__ -DENG_USING_API(Rend); +DE_USING_API(Rend); #endif #endif // DOOMSDAY_API_RENDER_H diff --git a/doomsday/apps/api/api_resource.h b/doomsday/apps/api/api_resource.h index 96b3a7e259..208b60ad4c 100644 --- a/doomsday/apps/api/api_resource.h +++ b/doomsday/apps/api/api_resource.h @@ -25,7 +25,7 @@ #include "api_uri.h" #include "dd_share.h" -DENG_API_TYPEDEF(R) +DE_API_TYPEDEF(R) { de_api_t api; @@ -132,9 +132,9 @@ DENG_API_TYPEDEF(R) int (*TextureUniqueId)(Uri const *uri); /*quiet=false*/ int (*TextureUniqueId2)(Uri const *uri, dd_bool quiet); } -DENG_API_T(R); +DE_API_T(R); -#ifndef DENG_NO_API_MACROS_RESOURCE +#ifndef DE_NO_API_MACROS_RESOURCE #define R_DeclarePatch _api_R.DeclarePatch #define R_GetPatchInfo _api_R.GetPatchInfo #define R_ComposePatchUri _api_R.ComposePatchUri @@ -152,7 +152,7 @@ DENG_API_T(R); #endif #ifdef __DOOMSDAY__ -DENG_USING_API(R); +DE_USING_API(R); #endif #endif // DOOMSDAY_API_RESOURCE_H diff --git a/doomsday/apps/api/api_server.h b/doomsday/apps/api/api_server.h index 7124d8843d..403bca9385 100644 --- a/doomsday/apps/api/api_server.h +++ b/doomsday/apps/api/api_server.h @@ -23,7 +23,7 @@ #include "apis.h" -DENG_API_TYPEDEF(Server) +DE_API_TYPEDEF(Server) { de_api_t api; @@ -33,14 +33,14 @@ DENG_API_TYPEDEF(Server) */ dd_bool (*CanTrustClientPos)(int player); } -DENG_API_T(Server); +DE_API_T(Server); -#ifndef DENG_NO_API_MACROS_SERVER +#ifndef DE_NO_API_MACROS_SERVER #define Sv_CanTrustClientPos _api_Server.CanTrustClientPos #endif #ifdef __DOOMSDAY__ -DENG_USING_API(Server); +DE_USING_API(Server); #endif #endif // DOOMSDAY_API_SERVER_H diff --git a/doomsday/apps/api/api_sound.h b/doomsday/apps/api/api_sound.h index 23ec294946..81f905a1fb 100644 --- a/doomsday/apps/api/api_sound.h +++ b/doomsday/apps/api/api_sound.h @@ -26,7 +26,7 @@ struct mobj_s; -DENG_API_TYPEDEF(S) +DE_API_TYPEDEF(S) { de_api_t api; @@ -150,9 +150,9 @@ DENG_API_TYPEDEF(S) */ void (*PauseMusic)(dd_bool doPause); } -DENG_API_T(S); +DE_API_T(S); -#ifndef DENG_NO_API_MACROS_SOUND +#ifndef DE_NO_API_MACROS_SOUND #define S_LocalSoundAtVolumeFrom _api_S.LocalSoundAtVolumeFrom #define S_LocalSoundAtVolume _api_S.LocalSoundAtVolume #define S_LocalSound _api_S.LocalSound @@ -171,7 +171,7 @@ DENG_API_T(S); #endif #ifdef __DOOMSDAY__ -DENG_USING_API(S); +DE_USING_API(S); #endif #endif // DOOMSDAY_API_SOUND_H diff --git a/doomsday/apps/api/api_svg.h b/doomsday/apps/api/api_svg.h index f764afe6d6..1d25f63beb 100644 --- a/doomsday/apps/api/api_svg.h +++ b/doomsday/apps/api/api_svg.h @@ -32,7 +32,7 @@ typedef struct def_svgline_s { const Point2Rawf* points; } def_svgline_t; -DENG_API_TYPEDEF(Svg) +DE_API_TYPEDEF(Svg) { de_api_t api; void (*NewSvg)(svgid_t svgId, const def_svgline_t* lines, uint numLines); @@ -40,9 +40,9 @@ DENG_API_TYPEDEF(Svg) void (*DrawSvg2)(svgid_t svgId, const Point2Rawf* origin, float scale); void (*DrawSvg3)(svgid_t svgId, const Point2Rawf* origin, float scale, float angle); } -DENG_API_T(Svg); +DE_API_T(Svg); -#ifndef DENG_NO_API_MACROS_SVG +#ifndef DE_NO_API_MACROS_SVG #define R_NewSvg _api_Svg.NewSvg #define GL_DrawSvg _api_Svg.DrawSvg #define GL_DrawSvg2 _api_Svg.DrawSvg2 @@ -50,7 +50,7 @@ DENG_API_T(Svg); #endif #if defined __DOOMSDAY__ && defined __CLIENT__ -DENG_USING_API(Svg); +DE_USING_API(Svg); #endif #endif /* DOOMSDAY_API_VECTORGRAPHIC_H */ diff --git a/doomsday/apps/api/api_thinker.h b/doomsday/apps/api/api_thinker.h index 73ba223f8a..7975a54bc6 100644 --- a/doomsday/apps/api/api_thinker.h +++ b/doomsday/apps/api/api_thinker.h @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_THINKER_H -#define LIBDENG_THINKER_H +#ifndef DE_THINKER_H +#define DE_THINKER_H #include "api_base.h" #include @@ -43,7 +43,7 @@ extern "C" { */ ///@{ -DENG_API_TYPEDEF(Thinker) +DE_API_TYPEDEF(Thinker) { de_api_t api; @@ -54,9 +54,9 @@ DENG_API_TYPEDEF(Thinker) int (*Iterate)(thinkfunc_t func, int (*callback) (thinker_t *, void *), void *context); } -DENG_API_T(Thinker); +DE_API_T(Thinker); -#ifndef DENG_NO_API_MACROS_THINKER +#ifndef DE_NO_API_MACROS_THINKER #define Thinker_Init _api_Thinker.Init #define Thinker_Run _api_Thinker.Run #define Thinker_Add _api_Thinker.Add @@ -65,7 +65,7 @@ DENG_API_T(Thinker); #endif #ifdef __DOOMSDAY__ -DENG_USING_API(Thinker); +DE_USING_API(Thinker); #endif ///@} @@ -74,4 +74,4 @@ DENG_USING_API(Thinker); } // extern "C" #endif -#endif // LIBDENG_THINKER_H +#endif // DE_THINKER_H diff --git a/doomsday/apps/api/api_uri.h b/doomsday/apps/api/api_uri.h index 2c0ea5f102..4fe406534d 100644 --- a/doomsday/apps/api/api_uri.h +++ b/doomsday/apps/api/api_uri.h @@ -23,8 +23,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_API_URI_H -#define LIBDENG_API_URI_H +#ifndef DE_API_URI_H +#define DE_API_URI_H #include "api_base.h" #include @@ -74,7 +74,7 @@ struct uri_s; // The uri instance (opaque). typedef struct uri_s UriWrapper; typedef UriWrapper Uri; -DENG_API_TYPEDEF(Uri) // v1 +DE_API_TYPEDEF(Uri) // v1 { de_api_t api; @@ -256,10 +256,10 @@ DENG_API_TYPEDEF(Uri) // v1 */ void (*ReadWithDefaultScheme)(UriWrapper* uri, Reader1* reader, char const* defaultScheme); -} DENG_API_T(Uri); +} DE_API_T(Uri); // Macros for accessing exported functions. -#ifndef DENG_NO_API_MACROS_URI +#ifndef DE_NO_API_MACROS_URI #define Uri_New _api_Uri.New #define Uri_NewWithPath3 _api_Uri.NewWithPath3 #define Uri_NewWithPath2 _api_Uri.NewWithPath2 @@ -290,7 +290,7 @@ DENG_API_TYPEDEF(Uri) // v1 // Internal access. #ifdef __DOOMSDAY__ -DENG_USING_API(Uri); +DE_USING_API(Uri); #endif -#endif /* LIBDENG_API_URI_H */ +#endif /* DE_API_URI_H */ diff --git a/doomsday/apps/api/apis.h b/doomsday/apps/api/apis.h index 00e645d53a..6ed06415f7 100644 --- a/doomsday/apps/api/apis.h +++ b/doomsday/apps/api/apis.h @@ -180,23 +180,23 @@ typedef struct de_api_s { int id; ///< API identification (including version) number. } de_api_t; -#define DENG_API_TYPEDEF(Name) typedef struct de_api_##Name##_s -#define DENG_API_T(Name) de_api_##Name##_t -#define DENG_DECLARE_API(Name) DENG_API_T(Name) _api_##Name -#define DENG_USING_API(Name) DENG_EXTERN_C DENG_DECLARE_API(Name) +#define DE_API_TYPEDEF(Name) typedef struct de_api_##Name##_s +#define DE_API_T(Name) de_api_##Name##_t +#define DE_DECLARE_API(Name) DE_API_T(Name) _api_##Name +#define DE_USING_API(Name) DE_EXTERN_C DE_DECLARE_API(Name) -#define DENG_API_EXCHANGE(APIs) \ - DENG_EXTERN_C void deng_API(int id, void *api) { \ +#define DE_API_EXCHANGE(APIs) \ + DE_EXTERN_C void deng_API(int id, void *api) { \ switch(id) { APIs \ default: break; } } -#define DENG_GET_API(Ident, Name) \ +#define DE_GET_API(Ident, Name) \ case Ident: \ memcpy(&_api_##Name, api, sizeof(_api_##Name)); \ - DENG_ASSERT(_api_##Name.api.id == Ident); \ + DE_ASSERT(_api_##Name.api.id == Ident); \ break; -#if defined (DENG_STATIC_LINK) -#define DENG_SYMBOL_PTR(var, symbolName) \ +#if defined (DE_STATIC_LINK) +#define DE_SYMBOL_PTR(var, symbolName) \ if (!qstrcmp(var, #symbolName)) { \ return reinterpret_cast(symbolName); \ } diff --git a/doomsday/apps/api/dd_share.h b/doomsday/apps/api/dd_share.h index dc8b513565..35d71e7ed2 100644 --- a/doomsday/apps/api/dd_share.h +++ b/doomsday/apps/api/dd_share.h @@ -22,8 +22,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_SHARED_H -#define LIBDENG_SHARED_H +#ifndef DE_SHARED_H +#define DE_SHARED_H #ifndef C_DECL # if defined(WIN32) @@ -857,4 +857,4 @@ enum { } // extern "C" #endif -#endif /* LIBDENG_SHARED_H */ +#endif /* DE_SHARED_H */ diff --git a/doomsday/apps/api/dd_version.h.in b/doomsday/apps/api/dd_version.h.in index ce595a40a7..3bf1876afd 100644 --- a/doomsday/apps/api/dd_version.h.in +++ b/doomsday/apps/api/dd_version.h.in @@ -21,8 +21,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_VERSION_H -#define LIBDENG_VERSION_H +#ifndef DEAPI_VERSION_H +#define DEAPI_VERSION_H #include "dengproject.h" @@ -31,9 +31,6 @@ extern "C" { #endif #define DOOMSDAY_NICENAME "Doomsday Engine" - -#define LIBDENG_PLUGINDESC "(" DOOMSDAY_NICENAME " Plugin)" - #define DOOMSDAY_HOMEURL "http://dengine.net" #define DOOMSDAY_MASTERURL "http://dengine.net/master.php" #define DOOMSDAY_DOCSURL "http://dengine.net/dew" @@ -51,19 +48,19 @@ extern "C" { * Revision number increases with each small (maintenance) release. */ -#define DOOMSDAY_VERSION_BASE "${DENG_VERSION}" -#define DOOMSDAY_VERSION_NUMBER ${DENG_VERSION_WINDOWS} // For WIN32 version info. +#define DOOMSDAY_VERSION_BASE "${DE_VERSION}" +#define DOOMSDAY_VERSION_NUMBER ${DE_VERSION_WINDOWS} // For WIN32 version info. /** * DOOMSDAY_RELEASE_TYPE determines the classification of the release. * Possible values are "Unstable", "Candidate" and "Stable". */ -#define DOOMSDAY_RELEASE_TYPE "${DENG_RELEASE_TYPE}" +#define DOOMSDAY_RELEASE_TYPE "${DE_RELEASE_TYPE}" /** * Copyright string is used in WIN32 binary metadata markup. */ -#define DOOMSDAY_COPYRIGHT "2003-2017, " DENGPROJECT_NICEAUTHOR +#define DOOMSDAY_COPYRIGHT "2003-2018, " DENGPROJECT_NICEAUTHOR /** * Version constants. The Game module can use DOOMSDAY_VERSION to @@ -72,7 +69,7 @@ extern "C" { */ #define DOOMSDAY_VERSION 20000 // Don't touch; see above. -#if !defined(DENG_STABLE) && defined(DOOMSDAY_BUILD_TEXT) +#if !defined(DE_STABLE) && defined(DOOMSDAY_BUILD_TEXT) /** The build number is included only for non-Stable builds. */ # define DOOMSDAY_VERSION_TEXT DOOMSDAY_VERSION_BASE " [#" DOOMSDAY_BUILD_TEXT "]" # if defined(WIN32) && defined(UNICODE) @@ -96,4 +93,4 @@ extern "C" { } // extern "C" #endif -#endif /* LIBDENG_VERSION_H */ +#endif /* DEAPI_VERSION_H */ diff --git a/doomsday/apps/api/def_share.h b/doomsday/apps/api/def_share.h index b5007dfedc..177136a4bb 100644 --- a/doomsday/apps/api/def_share.h +++ b/doomsday/apps/api/def_share.h @@ -20,8 +20,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_SHARED_GAME_DEFINITIONS_H -#define LIBDENG_SHARED_GAME_DEFINITIONS_H +#ifndef DE_SHARED_GAME_DEFINITIONS_H +#define DE_SHARED_GAME_DEFINITIONS_H #include "dd_types.h" #include @@ -190,4 +190,4 @@ typedef struct { } // extern "C" #endif -#endif // LIBDENG_SHARED_GAME_DEFINITIONS_H +#endif // DE_SHARED_GAME_DEFINITIONS_H diff --git a/doomsday/apps/client/CMakeLists.txt b/doomsday/apps/client/CMakeLists.txt index df538475ba..f94d7f6e5d 100644 --- a/doomsday/apps/client/CMakeLists.txt +++ b/doomsday/apps/client/CMakeLists.txt @@ -3,8 +3,8 @@ # Copyright (c) 2012-2014 Daniel Swanson cmake_minimum_required (VERSION 3.1) -project (DENG_CLIENT) -set (DENG_ENABLE_PK3S ON) +project (DE_CLIENT) +set (DE_ENABLE_PK3S ON) include (../../cmake/Config.cmake) # Dependencies -------------------------------------------------------------------------- @@ -19,7 +19,7 @@ endif () # Sources and includes ------------------------------------------------------------------ -include_directories (include ${DENG_API_DIR}) +include_directories (include ${DE_API_DIR}) add_definitions (-D__DOOMSDAY__=1 -D__CLIENT__=1) @@ -44,7 +44,7 @@ deng_merge_sources (ui_home src/ui/home/*.cpp) deng_merge_sources (ui_infine src/ui/infine/*.cpp) deng_merge_sources (ui_widgets src/ui/widgets/*.cpp) if (NOT IOS) - add_definitions (-DDENG_HAVE_UPDATER) + add_definitions (-DDE_HAVE_UPDATER) deng_merge_sources (updater src/updater/*.cpp) endif () deng_merge_sources (world src/world/*.cpp) @@ -71,16 +71,16 @@ endif () if (AMETHYST_FOUND) if (APPLE) set (readme "${CMAKE_CURRENT_BINARY_DIR}/Read Me.html") - deng_add_amedoc (HTML "${readme}" ${DENG_SOURCE_DIR}/doc/readme readme.ame) + deng_add_amedoc (HTML "${readme}" ${DE_SOURCE_DIR}/doc/readme readme.ame) install (FILES ${readme} DESTINATION .) list (APPEND SOURCES ${readme}) else () set (readme "${CMAKE_CURRENT_BINARY_DIR}/readme.html") - deng_add_amedoc (HTML ${readme} ${DENG_SOURCE_DIR}/doc/readme readme.ame) + deng_add_amedoc (HTML ${readme} ${DE_SOURCE_DIR}/doc/readme readme.ame) list (APPEND SOURCES ${readme}) if (WIN32) # WIX generator requires setting this manually. - set_property (INSTALL "${DENG_INSTALL_DOC_DIR}/readme.html" + set_property (INSTALL "${DE_INSTALL_DOC_DIR}/readme.html" PROPERTY CPACK_START_MENU_SHORTCUTS "Read Me" ) endif () @@ -88,7 +88,7 @@ if (AMETHYST_FOUND) # Manual page. if (UNIX) set (MAN_PAGE ${CMAKE_CURRENT_BINARY_DIR}/doomsday.6) - deng_add_amedoc (MAN ${MAN_PAGE} ${DENG_SOURCE_DIR}/doc/readme readme.ame) + deng_add_amedoc (MAN ${MAN_PAGE} ${DE_SOURCE_DIR}/doc/readme readme.ame) list (APPEND SOURCES ${MAN_PAGE}) endif () endif () @@ -191,7 +191,7 @@ if (IOS) ) elseif (APPLE) link_framework (client PUBLIC Cocoa) - if (DENG_HAVE_QTKIT) + if (DE_HAVE_QTKIT) link_framework (client PUBLIC QTKit) # MusicPlayer endif () endif () @@ -229,7 +229,7 @@ if (UNIX_LINUX) install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/net.dengine.Doomsday.desktop DESTINATION share/applications) install (FILES res/linux/deng-logo-256.png - DESTINATION ${DENG_INSTALL_DATA_DIR}) + DESTINATION ${DE_INSTALL_DATA_DIR}) endif () if (WIN32) @@ -241,10 +241,10 @@ if (WIN32) if (OPENSSL_DIR) find_file (OPENSSL_LIBEAY libeay32.dll PATHS ${OPENSSL_DIR} - PATH_SUFFIXES ${DENG_ARCH}) + PATH_SUFFIXES ${DE_ARCH}) find_file (OPENSSL_SSLEAY ssleay32.dll PATHS ${OPENSSL_DIR} - PATH_SUFFIXES ${DENG_ARCH}) + PATH_SUFFIXES ${DE_ARCH}) if (NOT OPENSSL_LIBEAY OR NOT OPENSSL_SSLEAY) message (FATAL_ERROR "Could not find OpenSSL libraries (libeay32.dll, ssleay32.dll)") endif () @@ -274,7 +274,7 @@ if (APPLE AND NOT IOS) # installed app before the plugins are there so it won't do unnecessary # work on them -- plugins are already self-contained. get_property (outName TARGET client PROPERTY OUTPUT_NAME) - set (stageDir "${DENG_BUILD_STAGING_DIR}/DengPlugins") + set (stageDir "${DE_BUILD_STAGING_DIR}/DengPlugins") if (IOS) set (destDir "${outName}.app/PlugIns") else () @@ -291,7 +291,7 @@ endif () if (VC_REDIST_LIBS_DEBUG) install (PROGRAMS ${VC_REDIST_LIBS_DEBUG} - DESTINATION ${DENG_INSTALL_LIB_DIR} + DESTINATION ${DE_INSTALL_LIB_DIR} CONFIGURATIONS Debug COMPONENT libs ) @@ -299,7 +299,7 @@ endif () if (VC_REDIST_LIBS) install (PROGRAMS ${VC_REDIST_LIBS} - DESTINATION ${DENG_INSTALL_LIB_DIR} + DESTINATION ${DE_INSTALL_LIB_DIR} CONFIGURATIONS Release COMPONENT libs ) @@ -315,7 +315,7 @@ if (MSVC) set (fn ${CMAKE_BINARY_DIR}/deployqt.bat) file (WRITE ${fn} "set PATH=\"${qtBins}\";%PATH% - \"${winDepCmd}\" -opengl --no-compiler-runtime --no-translations \"${DENG_VS_STAGING_DIR}/%1/bin/doomsday.exe\"" + \"${winDepCmd}\" -opengl --no-compiler-runtime --no-translations \"${DE_VS_STAGING_DIR}/%1/bin/doomsday.exe\"" ) set (_intDir ${CMAKE_CFG_INTDIR}) if (_intDir STREQUAL ".") diff --git a/doomsday/apps/client/client-mac.doxy b/doomsday/apps/client/client-mac.doxy index ce401d93e1..40adf0a9be 100644 --- a/doomsday/apps/client/client-mac.doxy +++ b/doomsday/apps/client/client-mac.doxy @@ -14,11 +14,11 @@ EXCLUDE = include/windows src/windows MACRO_EXPANSION = YES PREDEFINED = __DOOMSDAY__ __CLIENT__ UNIX MACOSX __cplusplus "C_DECL=" "GL_CALL=" \ "DENG2_PIMPL(ClassName)=typedef ClassName Public; struct ClassName::Instance : public de::Private" \ - "DENG2_PIMPL_NOREF(C)=struct C::Instance : public de::IPrivate" \ - "DENG_GUI_PIMPL(C)=struct C::public de::GuiWidgetPrivate" \ - "DENG2_PRIVATE(Var)=struct Instance; Instance *Var;" \ - "DENG2_ERROR(N)=class N : public de::Error {};" \ - "DENG2_SUB_ERROR(B,N)=class N : public B {};" \ - "DENG2_OBSERVES(C,A)=public C::I##Audience##Observer" + "DE_PIMPL_NOREF(C)=struct C::Instance : public de::IPrivate" \ + "DE_GUI_PIMPL(C)=struct C::public de::GuiWidgetPrivate" \ + "DE_PRIVATE(Var)=struct Instance; Instance *Var;" \ + "DE_ERROR(N)=class N : public de::Error {};" \ + "DE_SUB_ERROR(B,N)=class N : public B {};" \ + "DE_OBSERVES(C,A)=public C::I##Audience##Observer" EXTRACT_PRIVATE = NO diff --git a/doomsday/apps/client/client-win32.doxy b/doomsday/apps/client/client-win32.doxy index 5ada49bcfd..480b96cfae 100644 --- a/doomsday/apps/client/client-win32.doxy +++ b/doomsday/apps/client/client-win32.doxy @@ -13,12 +13,12 @@ EXCLUDE = include/unix include/macx src/unix src/macx MACRO_EXPANSION = YES PREDEFINED = __DOOMSDAY__ __CLIENT__ WIN32 __cplusplus \ - "DENG2_PIMPL(ClassName)=typedef ClassName Public; struct ClassName::Instance : public de::Private" \ - "DENG2_PIMPL_NOREF(C)=struct C::Instance : public de::IPrivate" \ - "DENG_GUI_PIMPL(C)=struct C::public de::GuiWidgetPrivate" \ - "DENG2_PRIVATE(Var)=struct Instance; Instance *Var;" \ - "DENG2_ERROR(N)=class N : public de::Error {};" \ - "DENG2_SUB_ERROR(B,N)=class N : public B {};" \ - "DENG2_OBSERVES(C,A)=public C::I##Audience##Observer" + "DE_PIMPL(ClassName)=typedef ClassName Public; struct ClassName::Instance : public de::Private" \ + "DE_PIMPL_NOREF(C)=struct C::Instance : public de::IPrivate" \ + "DE_GUI_PIMPL(C)=struct C::public de::GuiWidgetPrivate" \ + "DE_PRIVATE(Var)=struct Instance; Instance *Var;" \ + "DE_ERROR(N)=class N : public de::Error {};" \ + "DE_SUB_ERROR(B,N)=class N : public B {};" \ + "DE_OBSERVES(C,A)=public C::I##Audience##Observer" EXTRACT_PRIVATE = NO diff --git a/doomsday/apps/client/doomsday-engine.desktop.in b/doomsday/apps/client/doomsday-engine.desktop.in index 42c27dfbb4..92f5446852 100644 --- a/doomsday/apps/client/doomsday-engine.desktop.in +++ b/doomsday/apps/client/doomsday-engine.desktop.in @@ -6,5 +6,4 @@ Categories=Game;ActionGame; Exec=${CMAKE_INSTALL_PREFIX}/bin/doomsday Terminal=false Type=Application -Icon=${CMAKE_INSTALL_PREFIX}/${DENG_INSTALL_DATA_DIR}/deng-logo-256.png - +Icon=${CMAKE_INSTALL_PREFIX}/${DE_INSTALL_DATA_DIR}/deng-logo-256.png diff --git a/doomsday/apps/client/include/audio/audiodriver.h b/doomsday/apps/client/include/audio/audiodriver.h index be6507fab6..1c40fed988 100644 --- a/doomsday/apps/client/include/audio/audiodriver.h +++ b/doomsday/apps/client/include/audio/audiodriver.h @@ -45,7 +45,7 @@ class AudioDriver { public: /// Base class for load related errors. @ingroup errors - DENG2_ERROR(LoadError); + DE_ERROR(LoadError); /** * Logical driver status. @@ -153,7 +153,7 @@ class AudioDriver de::String interfaceName(void *anyAudioInterface) const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; de::String AudioDriver_GetName(audiodriverid_t id); diff --git a/doomsday/apps/client/include/audio/audiosystem.h b/doomsday/apps/client/include/audio/audiosystem.h index 0f4c7e6aa7..80f6ecbb1f 100644 --- a/doomsday/apps/client/include/audio/audiosystem.h +++ b/doomsday/apps/client/include/audio/audiosystem.h @@ -277,7 +277,7 @@ class AudioSystem : public de::System void startLogical(int soundIdAndFlags, struct mobj_s const *emitter); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; // Music: --------------------------------------------------------------------------- diff --git a/doomsday/apps/client/include/audio/s_cache.h b/doomsday/apps/client/include/audio/s_cache.h index 5ddac149a1..8700938854 100644 --- a/doomsday/apps/client/include/audio/s_cache.h +++ b/doomsday/apps/client/include/audio/s_cache.h @@ -40,7 +40,7 @@ class SfxSampleCache { public: /// Notified when a sound sample is about to be removed from the cache. - DENG2_DEFINE_AUDIENCE2(SampleRemove, void sfxSampleCacheAboutToRemove(sfxsample_t const &sample)) + DE_DEFINE_AUDIENCE2(SampleRemove, void sfxSampleCacheAboutToRemove(sfxsample_t const &sample)) struct CacheItem { @@ -109,7 +109,7 @@ class SfxSampleCache void info(uint *cacheBytes, uint *sampleCount); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace audio diff --git a/doomsday/apps/client/include/audio/s_environ.h b/doomsday/apps/client/include/audio/s_environ.h index e42f209f30..19043f7afd 100644 --- a/doomsday/apps/client/include/audio/s_environ.h +++ b/doomsday/apps/client/include/audio/s_environ.h @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef DENG_SOUND_ENVIRON -#define DENG_SOUND_ENVIRON +#ifndef DE_SOUND_ENVIRON +#define DE_SOUND_ENVIRON #include @@ -62,4 +62,4 @@ AudioEnvironment const &S_AudioEnvironment(AudioEnvironmentId id); */ AudioEnvironmentId S_AudioEnvironmentId(de::Uri const *uri); -#endif // DENG_SOUND_ENVIRON +#endif // DE_SOUND_ENVIRON diff --git a/doomsday/apps/client/include/audio/sfxchannel.h b/doomsday/apps/client/include/audio/sfxchannel.h index bed5028023..01e60b5cc6 100644 --- a/doomsday/apps/client/include/audio/sfxchannel.h +++ b/doomsday/apps/client/include/audio/sfxchannel.h @@ -46,7 +46,7 @@ class SfxChannel { public: /// No sound buffer is assigned to the channel. @ingroup errors - DENG2_ERROR(MissingBufferError); + DE_ERROR(MissingBufferError); public: SfxChannel(); @@ -116,7 +116,7 @@ class SfxChannel void setStartTime(int newStartTime); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; /** @@ -167,7 +167,7 @@ class SfxChannels de::LoopResult forAll(std::function func) const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace audio diff --git a/doomsday/apps/client/include/audio/sys_audiod_dummy.h b/doomsday/apps/client/include/audio/sys_audiod_dummy.h index ab29cc164c..111c5e4df2 100644 --- a/doomsday/apps/client/include/audio/sys_audiod_dummy.h +++ b/doomsday/apps/client/include/audio/sys_audiod_dummy.h @@ -31,9 +31,9 @@ #include "api_audiod_sfx.h" #include "api_audiod_mus.h" -DENG_EXTERN_C audiodriver_t audiod_dummy; -DENG_EXTERN_C audiointerface_sfx_t audiod_dummy_sfx; -DENG_EXTERN_C audiointerface_music_t audiod_dummy_music; -DENG_EXTERN_C audiointerface_cd_t audiod_dummy_cd; +DE_EXTERN_C audiodriver_t audiod_dummy; +DE_EXTERN_C audiointerface_sfx_t audiod_dummy_sfx; +DE_EXTERN_C audiointerface_music_t audiod_dummy_music; +DE_EXTERN_C audiointerface_cd_t audiod_dummy_cd; #endif diff --git a/doomsday/apps/client/include/audio/sys_audiod_sdlmixer.h b/doomsday/apps/client/include/audio/sys_audiod_sdlmixer.h index 9f2941ad7c..4e2600fe47 100644 --- a/doomsday/apps/client/include/audio/sys_audiod_sdlmixer.h +++ b/doomsday/apps/client/include/audio/sys_audiod_sdlmixer.h @@ -32,8 +32,8 @@ #include "api_audiod_sfx.h" #include "api_audiod_mus.h" -DENG_EXTERN_C audiodriver_t audiod_sdlmixer; -DENG_EXTERN_C audiointerface_sfx_t audiod_sdlmixer_sfx; -DENG_EXTERN_C audiointerface_music_t audiod_sdlmixer_music; +DE_EXTERN_C audiodriver_t audiod_sdlmixer; +DE_EXTERN_C audiointerface_sfx_t audiod_sdlmixer_sfx; +DE_EXTERN_C audiointerface_music_t audiod_sdlmixer_music; #endif diff --git a/doomsday/apps/client/include/busyrunner.h b/doomsday/apps/client/include/busyrunner.h index 6350d50f0f..3dcd166b3f 100644 --- a/doomsday/apps/client/include/busyrunner.h +++ b/doomsday/apps/client/include/busyrunner.h @@ -47,7 +47,7 @@ class BusyRunner : public BusyMode::ITaskRunner /// Called during the busy loop from the main thread. /// @return @c true, if all deferred tasks have been completed. @c false, if /// deferred tasks still remain afterwards. - DENG2_DEFINE_AUDIENCE2(DeferredGLTask, DeferredResult performDeferredGLTask()) + DE_DEFINE_AUDIENCE2(DeferredGLTask, DeferredResult performDeferredGLTask()) public: BusyRunner(); @@ -70,7 +70,7 @@ class BusyRunner : public BusyMode::ITaskRunner void finishTask(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; /** diff --git a/doomsday/apps/client/include/client/cl_def.h b/doomsday/apps/client/include/client/cl_def.h index f03c0656ec..4b1227acdb 100644 --- a/doomsday/apps/client/include/client/cl_def.h +++ b/doomsday/apps/client/include/client/cl_def.h @@ -17,20 +17,20 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_H -#define DENG_CLIENT_H +#ifndef DE_CLIENT_H +#define DE_CLIENT_H #include "world/p_object.h" #define SHORTP(x) (*(short*) (x)) #define USHORTP(x) (*(unsigned short*) (x)) -DENG_EXTERN_C ident_t clientID; -DENG_EXTERN_C int serverTime; -DENG_EXTERN_C bool handshakeReceived; -DENG_EXTERN_C int gameReady; -DENG_EXTERN_C bool netLoggedIn; -DENG_EXTERN_C int clientPaused; +DE_EXTERN_C ident_t clientID; +DE_EXTERN_C int serverTime; +DE_EXTERN_C bool handshakeReceived; +DE_EXTERN_C int gameReady; +DE_EXTERN_C bool netLoggedIn; +DE_EXTERN_C int clientPaused; void Cl_InitID(); @@ -54,4 +54,4 @@ int Cl_GameReady(); */ void Cl_SendHello(); -#endif // DENG_CLIENT_H +#endif // DE_CLIENT_H diff --git a/doomsday/apps/client/include/client/cl_frame.h b/doomsday/apps/client/include/client/cl_frame.h index f62513be9f..86b3344ecd 100644 --- a/doomsday/apps/client/include/client/cl_frame.h +++ b/doomsday/apps/client/include/client/cl_frame.h @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_FRAME_H -#define DENG_CLIENT_FRAME_H +#ifndef DE_CLIENT_FRAME_H +#define DE_CLIENT_FRAME_H void Cl_InitFrame(); void Cl_ResetFrame(); @@ -30,4 +30,4 @@ void Cl_Frame2Received(int packetType); float Cl_FrameGameTime(); -#endif // DENG_CLIENT_FRAME_H +#endif // DE_CLIENT_FRAME_H diff --git a/doomsday/apps/client/include/client/cl_mobj.h b/doomsday/apps/client/include/client/cl_mobj.h index f232cabd47..ba762b786f 100644 --- a/doomsday/apps/client/include/client/cl_mobj.h +++ b/doomsday/apps/client/include/client/cl_mobj.h @@ -18,14 +18,14 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_WORLD_MOBJ_H -#define DENG_CLIENT_WORLD_MOBJ_H +#ifndef DE_CLIENT_WORLD_MOBJ_H +#define DE_CLIENT_WORLD_MOBJ_H #include "world/p_object.h" #include "world/clientmobjthinkerdata.h" /// Asserts that a given mobj is a client mobj. -#define CL_ASSERT_CLMOBJ(mo) DENG_ASSERT(Cl_IsClientMobj(mo)); +#define CL_ASSERT_CLMOBJ(mo) DE_ASSERT(Cl_IsClientMobj(mo)); /** * Make the real player mobj identical with the client mobj. @@ -84,4 +84,4 @@ void ClMobj_ReadNullDelta(); */ dd_bool Cl_IsClientMobj(mobj_t const *mo); -#endif // DENG_CLIENT_WORLD_MOBJ_H +#endif // DE_CLIENT_WORLD_MOBJ_H diff --git a/doomsday/apps/client/include/client/cl_player.h b/doomsday/apps/client/include/client/cl_player.h index adaae7039f..25d87f7718 100644 --- a/doomsday/apps/client/include/client/cl_player.h +++ b/doomsday/apps/client/include/client/cl_player.h @@ -17,14 +17,14 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_PLAYER_H -#define DENG_CLIENT_PLAYER_H +#ifndef DE_CLIENT_PLAYER_H +#define DE_CLIENT_PLAYER_H #include "cl_mobj.h" #include "clientplayer.h" -DENG_EXTERN_C float pspMoveSpeed; -DENG_EXTERN_C float cplrThrustMul; +DE_EXTERN_C float pspMoveSpeed; +DE_EXTERN_C float cplrThrustMul; /** * Clears the player state table. @@ -72,4 +72,4 @@ mobj_t *ClPlayer_LocalGameMobj(int plrNum); */ bool ClPlayer_IsFreeToMove(int plrnum); -#endif // DENG_CLIENT_PLAYER_H +#endif // DE_CLIENT_PLAYER_H diff --git a/doomsday/apps/client/include/client/cl_sound.h b/doomsday/apps/client/include/client/cl_sound.h index 11bea9ef6e..e3713a1ad8 100644 --- a/doomsday/apps/client/include/client/cl_sound.h +++ b/doomsday/apps/client/include/client/cl_sound.h @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_SOUND_H -#define DENG_CLIENT_SOUND_H +#ifndef DE_CLIENT_SOUND_H +#define DE_CLIENT_SOUND_H #include "network/protocol.h" @@ -33,4 +33,4 @@ void Cl_ReadSoundDelta(deltatype_t type); */ void Cl_Sound(); -#endif // DENG_CLIENT_SOUND_H +#endif // DE_CLIENT_SOUND_H diff --git a/doomsday/apps/client/include/client/cl_world.h b/doomsday/apps/client/include/client/cl_world.h index 6be4fd58e3..6f5c6ce4f2 100644 --- a/doomsday/apps/client/include/client/cl_world.h +++ b/doomsday/apps/client/include/client/cl_world.h @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_WORLD_MAP_H -#define DENG_CLIENT_WORLD_MAP_H +#ifndef DE_CLIENT_WORLD_MAP_H +#define DE_CLIENT_WORLD_MAP_H void Cl_InitTransTables(); void Cl_ResetTransTables(); @@ -57,4 +57,4 @@ void Cl_ReadSideDelta(int deltaType); */ void Cl_ReadPolyDelta(); -#endif // DENG_CLIENT_WORLD_MAP_H +#endif // DE_CLIENT_WORLD_MAP_H diff --git a/doomsday/apps/client/include/client/cledgeloop.h b/doomsday/apps/client/include/client/cledgeloop.h index 5adcf0278c..c291949eab 100644 --- a/doomsday/apps/client/include/client/cledgeloop.h +++ b/doomsday/apps/client/include/client/cledgeloop.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_WORLD_CLEDGELOOP_H -#define DENG_CLIENT_WORLD_CLEDGELOOP_H +#ifndef DE_CLIENT_WORLD_CLEDGELOOP_H +#define DE_CLIENT_WORLD_CLEDGELOOP_H #include #include "misc/hedge.h" @@ -57,9 +57,9 @@ class ClEdgeLoop void fixSurfacesMissingMaterials(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace world -#endif // DENG_CLIENT_WORLD_CLEDGELOOP_H +#endif // DE_CLIENT_WORLD_CLEDGELOOP_H diff --git a/doomsday/apps/client/include/client/clientsubsector.h b/doomsday/apps/client/include/client/clientsubsector.h index 35fb49e5d7..29db0b37cc 100644 --- a/doomsday/apps/client/include/client/clientsubsector.h +++ b/doomsday/apps/client/include/client/clientsubsector.h @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_CLIENTSUBSECTOR_H -#define DENG_WORLD_CLIENTSUBSECTOR_H +#ifndef DE_WORLD_CLIENTSUBSECTOR_H +#define DE_WORLD_CLIENTSUBSECTOR_H #include #include @@ -292,9 +292,9 @@ class ClientSubsector : public Subsector, public ILightSource void markVisPlanesDirty(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace world -#endif // DENG_WORLD_CLIENTSUBSECTOR_H +#endif // DE_WORLD_CLIENTSUBSECTOR_H diff --git a/doomsday/apps/client/include/client/clplanemover.h b/doomsday/apps/client/include/client/clplanemover.h index 881d5ac0fd..7afaab3ece 100644 --- a/doomsday/apps/client/include/client/clplanemover.h +++ b/doomsday/apps/client/include/client/clplanemover.h @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_PLANEMOVER_H -#define DENG_CLIENT_PLANEMOVER_H +#ifndef DE_CLIENT_PLANEMOVER_H +#define DE_CLIENT_PLANEMOVER_H #include "api_thinker.h" #include "Plane" @@ -53,4 +53,4 @@ class ClPlaneMover : public ThinkerData static thinker_s *newThinker(Plane &plane, coord_t dest, float speed); }; -#endif // DENG_CLIENT_PLANEMOVER_H +#endif // DE_CLIENT_PLANEMOVER_H diff --git a/doomsday/apps/client/include/client/clpolymover.h b/doomsday/apps/client/include/client/clpolymover.h index c3607afac0..12d12f8c54 100644 --- a/doomsday/apps/client/include/client/clpolymover.h +++ b/doomsday/apps/client/include/client/clpolymover.h @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_POLYMOVER_H -#define DENG_CLIENT_POLYMOVER_H +#ifndef DE_CLIENT_POLYMOVER_H +#define DE_CLIENT_POLYMOVER_H #include #include "api_thinker.h" @@ -44,4 +44,4 @@ class ClPolyMover : public ThinkerData static thinker_s *newThinker(Polyobj &polyobj, bool moving, bool rotating); }; -#endif // DENG_CLIENT_POLYMOVER_H +#endif // DE_CLIENT_POLYMOVER_H diff --git a/doomsday/apps/client/include/client/clskyplane.h b/doomsday/apps/client/include/client/clskyplane.h index 3bf592fba4..9c45eda17c 100644 --- a/doomsday/apps/client/include/client/clskyplane.h +++ b/doomsday/apps/client/include/client/clskyplane.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_WORLD_CLSKYPLANE_H -#define DENG_CLIENT_WORLD_CLSKYPLANE_H +#ifndef DE_CLIENT_WORLD_CLSKYPLANE_H +#define DE_CLIENT_WORLD_CLSKYPLANE_H #include @@ -32,7 +32,7 @@ class ClSkyPlane { public: /// Notified whenever a @em height change occurs. - DENG2_DEFINE_AUDIENCE2(HeightChange, void clSkyPlaneHeightChanged(ClSkyPlane &skyPlane)) + DE_DEFINE_AUDIENCE2(HeightChange, void clSkyPlaneHeightChanged(ClSkyPlane &skyPlane)) ClSkyPlane(bool isCeiling = false, de::ddouble defaultHeight = 0); @@ -66,9 +66,9 @@ class ClSkyPlane void setHeight(de::ddouble newHeight); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace world -#endif // DENG_CLIENT_WORLD_CLSKYPLANE_H +#endif // DE_CLIENT_WORLD_CLSKYPLANE_H diff --git a/doomsday/apps/client/include/clientapp.h b/doomsday/apps/client/include/clientapp.h index 9bb8fb781e..59cef2aae3 100644 --- a/doomsday/apps/client/include/clientapp.h +++ b/doomsday/apps/client/include/clientapp.h @@ -36,8 +36,8 @@ class RenderSystem; class ServerLink; class Updater; -#if !defined (DENG_MOBILE) -# define DENG_HAVE_BUSYRUNNER 1 +#if !defined (DE_MOBILE) +# define DE_HAVE_BUSYRUNNER 1 class BusyRunner; #endif @@ -95,7 +95,7 @@ class ClientApp : public de::BaseGuiApp, public DoomsdayApp static ClientResources & resources(); static ClientServerWorld & world(); -#if defined (DENG_HAVE_BUSYRUNNER) +#if defined (DE_HAVE_BUSYRUNNER) static BusyRunner & busyRunner(); #endif @@ -103,7 +103,7 @@ class ClientApp : public de::BaseGuiApp, public DoomsdayApp static bool hasRenderSystem(); static bool hasAudioSystem(); -#if defined (DENG_HAVE_UPDATER) +#if defined (DE_HAVE_UPDATER) static Updater &updater(); #endif @@ -117,7 +117,7 @@ public slots: void reset() override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // CLIENTAPP_H diff --git a/doomsday/apps/client/include/clientplayer.h b/doomsday/apps/client/include/clientplayer.h index 84c0e3ea2f..f5c7667fb8 100644 --- a/doomsday/apps/client/include/clientplayer.h +++ b/doomsday/apps/client/include/clientplayer.h @@ -105,7 +105,7 @@ class ClientPlayer : public Player void weaponStateChanged(struct state_s const *state); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // CLIENT_CLIENTPLAYER_H diff --git a/doomsday/apps/client/include/con_config.h b/doomsday/apps/client/include/con_config.h index 8d611c1b5c..7497c30313 100644 --- a/doomsday/apps/client/include/con_config.h +++ b/doomsday/apps/client/include/con_config.h @@ -18,8 +18,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CONSOLE_CONFIG_H -#define DENG_CONSOLE_CONFIG_H +#ifndef DE_CONSOLE_CONFIG_H +#define DE_CONSOLE_CONFIG_H #include "dd_share.h" @@ -49,4 +49,4 @@ void Con_SaveDefaultsIfChanged(); D_CMD(WriteConsole); -#endif // DENG_CONSOLE_CONFIG_H +#endif // DE_CONSOLE_CONFIG_H diff --git a/doomsday/apps/client/include/configprofiles.h b/doomsday/apps/client/include/configprofiles.h index 1e459b3b7e..86ecf7dbbf 100644 --- a/doomsday/apps/client/include/configprofiles.h +++ b/doomsday/apps/client/include/configprofiles.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CONFIGPROFILES_H -#define DENG_CONFIGPROFILES_H +#ifndef DE_CONFIGPROFILES_H +#define DE_CONFIGPROFILES_H #include #include @@ -55,7 +55,7 @@ class ConfigProfiles : public de::Profiles }; /// Notified when the current profile has changed. - DENG2_DEFINE_AUDIENCE(ProfileChange, void currentProfileChanged(de::String const &name)) + DE_DEFINE_AUDIENCE(ProfileChange, void currentProfileChanged(de::String const &name)) public: ConfigProfiles(); @@ -130,7 +130,7 @@ class ConfigProfiles : public de::Profiles de::Info::BlockElement const &block) override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CONFIGPROFILES_H +#endif // DE_CONFIGPROFILES_H diff --git a/doomsday/apps/client/include/dd_def.h b/doomsday/apps/client/include/dd_def.h index 3b17167a61..e6f8e216d6 100644 --- a/doomsday/apps/client/include/dd_def.h +++ b/doomsday/apps/client/include/dd_def.h @@ -48,7 +48,7 @@ extern "C" { // if rangecheck is undefined, most parameter validation debugging code // will not be compiled -#ifndef DENG_NO_RANGECHECKING +#ifndef DE_NO_RANGECHECKING # define RANGECHECK #endif @@ -70,7 +70,7 @@ extern "C" { # define DOOMSDAY_VER_ID_64BIT " 32-bit" #endif -#if defined(DENG_STABLE) && defined(DOOMSDAY_BUILD_TEXT) +#if defined(DE_STABLE) && defined(DOOMSDAY_BUILD_TEXT) # define DOOMSDAY_VER_ID_BUILD " #" DOOMSDAY_BUILD_TEXT #else # define DOOMSDAY_VER_ID_BUILD "" diff --git a/doomsday/apps/client/include/dd_loop.h b/doomsday/apps/client/include/dd_loop.h index 92cb76062d..8b57bc5963 100644 --- a/doomsday/apps/client/include/dd_loop.h +++ b/doomsday/apps/client/include/dd_loop.h @@ -24,10 +24,10 @@ #include "dd_types.h" -DENG_EXTERN_C float frameTimePos; // 0...1: fractional part for sharp game tics -DENG_EXTERN_C int rFrameCount; -DENG_EXTERN_C timespan_t sysTime, gameTime, demoTime; -DENG_EXTERN_C dd_bool tickFrame; +DE_EXTERN_C float frameTimePos; // 0...1: fractional part for sharp game tics +DE_EXTERN_C int rFrameCount; +DE_EXTERN_C timespan_t sysTime, gameTime, demoTime; +DE_EXTERN_C dd_bool tickFrame; #ifdef __cplusplus extern "C" { diff --git a/doomsday/apps/client/include/dd_main.h b/doomsday/apps/client/include/dd_main.h index 09819287d9..36ca661ca4 100644 --- a/doomsday/apps/client/include/dd_main.h +++ b/doomsday/apps/client/include/dd_main.h @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_MAIN_H -#define DENG_MAIN_H +#ifndef DE_MAIN_H +#define DE_MAIN_H #include #include @@ -52,9 +52,9 @@ void DD_ConsoleRegister(); /** * Print an error message and quit. */ -DENG2_NORETURN void App_Error(char const *error, ...); +DE_NORETURN void App_Error(char const *error, ...); -DENG2_NORETURN void App_AbnormalShutdown(char const *error); +DE_NORETURN void App_AbnormalShutdown(char const *error); /// Returns the application's global audio subsystem. AudioSystem &App_AudioSystem(); @@ -124,4 +124,4 @@ de::String DD_MaterialSchemeNameForTextureScheme(de::String textureSchemeName); fontschemeid_t DD_ParseFontSchemeName(char const *str); #endif -#endif // DENG_MAIN_H +#endif // DE_MAIN_H diff --git a/doomsday/apps/client/include/dd_pinit.h b/doomsday/apps/client/include/dd_pinit.h index 28185808ad..75acf1bd07 100644 --- a/doomsday/apps/client/include/dd_pinit.h +++ b/doomsday/apps/client/include/dd_pinit.h @@ -20,8 +20,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_PORTABLE_INIT_H -#define LIBDENG_PORTABLE_INIT_H +#ifndef DE_PORTABLE_INIT_H +#define DE_PORTABLE_INIT_H #include "api_internaldata.h" #include @@ -71,4 +71,4 @@ void DD_InitCommandLine(void); } // extern "C" #endif -#endif /* LIBDENG_PORTABLE_INIT_H */ +#endif /* DE_PORTABLE_INIT_H */ diff --git a/doomsday/apps/client/include/de_base.h b/doomsday/apps/client/include/de_base.h index 0d0308cc1e..a13ace55f7 100644 --- a/doomsday/apps/client/include/de_base.h +++ b/doomsday/apps/client/include/de_base.h @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef LIBDENG_BASE_H -#define LIBDENG_BASE_H +#ifndef DE_BASE_H +#define DE_BASE_H // System headers needed everywhere. #include @@ -54,4 +54,4 @@ # include "server_dummies.h" #endif -#endif // LIBDENG_BASE_H +#endif // DE_BASE_H diff --git a/doomsday/apps/client/include/de_platform.h b/doomsday/apps/client/include/de_platform.h index c0d8f19f47..accfa037f0 100644 --- a/doomsday/apps/client/include/de_platform.h +++ b/doomsday/apps/client/include/de_platform.h @@ -41,7 +41,7 @@ # include # include # include -# ifndef DENG2_QT_5_0_OR_NEWER +# ifndef DE_QT_5_0_OR_NEWER # include # endif #endif diff --git a/doomsday/apps/client/include/def_main.h b/doomsday/apps/client/include/def_main.h index 13b0696225..520ee0e3e1 100644 --- a/doomsday/apps/client/include/def_main.h +++ b/doomsday/apps/client/include/def_main.h @@ -47,7 +47,7 @@ struct Array : public std::vector std::vector::clear(); } PODType *append(int count = 1) { - DENG2_ASSERT(count >= 0); + DE_ASSERT(count >= 0); for(int i = 0; i < count; ++i) { std::vector::push_back(PODType()); } diff --git a/doomsday/apps/client/include/edit_map.h b/doomsday/apps/client/include/edit_map.h index 840722ce22..755ea13b57 100644 --- a/doomsday/apps/client/include/edit_map.h +++ b/doomsday/apps/client/include/edit_map.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_WORLD_EDITMAP_H -#define DENG_WORLD_EDITMAP_H +#ifndef DE_WORLD_EDITMAP_H +#define DE_WORLD_EDITMAP_H #include "world/map.h" @@ -36,4 +36,4 @@ world::Map *MPE_Map(); */ world::Map *MPE_TakeMap(); -#endif // DENG_WORLD_EDITMAP_H +#endif // DE_WORLD_EDITMAP_H diff --git a/doomsday/apps/client/include/gl/gl_defer.h b/doomsday/apps/client/include/gl/gl_defer.h index a563b307ea..e564ee145e 100644 --- a/doomsday/apps/client/include/gl/gl_defer.h +++ b/doomsday/apps/client/include/gl/gl_defer.h @@ -23,8 +23,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_GL_DEFERRED_H -#define DENG_CLIENT_GL_DEFERRED_H +#ifndef DE_CLIENT_GL_DEFERRED_H +#define DE_CLIENT_GL_DEFERRED_H #include "api_gl.h" #include "sys_opengl.h" @@ -96,19 +96,19 @@ extern "C" { #endif // Deferring functions for various function signatures. -#define LIBDENG_GL_DEFER1(form, x) void GL_Defer_##form(void (GL_CALL *ptr)(x), x) -#define LIBDENG_GL_DEFER2(form, x, y) void GL_Defer_##form(void (GL_CALL* ptr)(x, y), x, y) -#define LIBDENG_GL_DEFER3(form, x, y, z) void GL_Defer_##form(void (GL_CALL* ptr)(x, y, z), x, y, z) -#define LIBDENG_GL_DEFER4(form, x, y, z, w) void GL_Defer_##form(void (GL_CALL* ptr)(x, y, z, w), x, y, z, w) +#define DE_GL_DEFER1(form, x) void GL_Defer_##form(void (GL_CALL *ptr)(x), x) +#define DE_GL_DEFER2(form, x, y) void GL_Defer_##form(void (GL_CALL* ptr)(x, y), x, y) +#define DE_GL_DEFER3(form, x, y, z) void GL_Defer_##form(void (GL_CALL* ptr)(x, y, z), x, y, z) +#define DE_GL_DEFER4(form, x, y, z, w) void GL_Defer_##form(void (GL_CALL* ptr)(x, y, z, w), x, y, z, w) -LIBDENG_GL_DEFER1(e, GLenum e); -LIBDENG_GL_DEFER2(i, GLenum e, GLint i); -LIBDENG_GL_DEFER2(f, GLenum e, GLfloat f); -LIBDENG_GL_DEFER2(fv4, GLenum e, const GLfloat* floatArrayFourValues); -LIBDENG_GL_DEFER2(uintArray, GLsizei count, const GLuint* values); +DE_GL_DEFER1(e, GLenum e); +DE_GL_DEFER2(i, GLenum e, GLint i); +DE_GL_DEFER2(f, GLenum e, GLfloat f); +DE_GL_DEFER2(fv4, GLenum e, const GLfloat* floatArrayFourValues); +DE_GL_DEFER2(uintArray, GLsizei count, const GLuint* values); #ifdef __cplusplus } // extern "C" #endif -#endif // DENG_CLIENT_GL_DEFERRED_H +#endif // DE_CLIENT_GL_DEFERRED_H diff --git a/doomsday/apps/client/include/gl/gl_deferredapi.h b/doomsday/apps/client/include/gl/gl_deferredapi.h index 4b8176481b..961eddda2d 100644 --- a/doomsday/apps/client/include/gl/gl_deferredapi.h +++ b/doomsday/apps/client/include/gl/gl_deferredapi.h @@ -25,17 +25,17 @@ * 02110-1301 USA */ -#ifndef LIBDENG_DEFERRED_GL_API_H -#define LIBDENG_DEFERRED_GL_API_H +#ifndef DE_DEFERRED_GL_API_H +#define DE_DEFERRED_GL_API_H #ifdef __CLIENT__ /** - * @def LIBDENG_DISABLE_DEFERRED_GL_API + * @def DE_DISABLE_DEFERRED_GL_API * Disables the automatic rerouting of GL API calls to the deferring queue. * Put this in the beginning of a source file, before all #includes. */ -#ifndef LIBDENG_DISABLE_DEFERRED_GL_API +#ifndef DE_DISABLE_DEFERRED_GL_API #include "sys_opengl.h" // ensure native OpenGL has been included @@ -53,5 +53,5 @@ void Deferred_glDeleteTextures(GLsizei num, const GLuint* names); #endif // __CLIENT__ -#endif // LIBDENG_DISABLE_DEFERRED_GL_API -#endif // LIBDENG_DEFERRED_GL_API_H +#endif // DE_DISABLE_DEFERRED_GL_API +#endif // DE_DEFERRED_GL_API_H diff --git a/doomsday/apps/client/include/gl/gl_draw.h b/doomsday/apps/client/include/gl/gl_draw.h index a835b49b5d..32664641b4 100644 --- a/doomsday/apps/client/include/gl/gl_draw.h +++ b/doomsday/apps/client/include/gl/gl_draw.h @@ -22,8 +22,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_GRAPHICS_DRAW_H -#define LIBDENG_GRAPHICS_DRAW_H +#ifndef DE_GRAPHICS_DRAW_H +#define DE_GRAPHICS_DRAW_H #include #include @@ -66,4 +66,4 @@ void GL_DrawCutRectf2Tiled(double x, double y, double w, double h, int tw, int t } // extern "C" #endif -#endif // LIBDENG_GRAPHICS_DRAW_H +#endif // DE_GRAPHICS_DRAW_H diff --git a/doomsday/apps/client/include/gl/gl_main.h b/doomsday/apps/client/include/gl/gl_main.h index 7a88e85c82..75a6a721d1 100644 --- a/doomsday/apps/client/include/gl/gl_main.h +++ b/doomsday/apps/client/include/gl/gl_main.h @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef DENG_GL_MAIN_H -#define DENG_GL_MAIN_H +#ifndef DE_GL_MAIN_H +#define DE_GL_MAIN_H #ifndef __CLIENT__ # error "gl only exists in the Client" @@ -49,26 +49,26 @@ namespace world { class Material; } #define MINTEXWIDTH 8 #define MINTEXHEIGHT 8 -DENG_EXTERN_C float vid_gamma, vid_bright, vid_contrast; -DENG_EXTERN_C int r_detail; +DE_EXTERN_C float vid_gamma, vid_bright, vid_contrast; +DE_EXTERN_C int r_detail; #ifdef _DEBUG -# define DENG_ASSERT_GL_CONTEXT_ACTIVE() {DENG2_ASSERT(QOpenGLContext::currentContext() != nullptr);} +# define DE_ASSERT_GL_CONTEXT_ACTIVE() {DE_ASSERT(QOpenGLContext::currentContext() != nullptr);} #else -# define DENG_ASSERT_GL_CONTEXT_ACTIVE() +# define DE_ASSERT_GL_CONTEXT_ACTIVE() #endif #define Sys_GLCheckError() Sys_GLCheckErrorArgs(__FILE__, __LINE__) #ifdef _DEBUG -# define LIBDENG_ASSERT_GL_TEXTURE_ISBOUND(tex) { \ +# define DE_ASSERT_GL_TEXTURE_ISBOUND(tex) { \ GLint p; \ glGetIntegerv(GL_TEXTURE_BINDING_2D, &p); \ Sys_GLCheckError(); \ assert(p == (GLint)tex); \ } #else -# define LIBDENG_ASSERT_GL_TEXTURE_ISBOUND(tex) +# define DE_ASSERT_GL_TEXTURE_ISBOUND(tex) #endif void GL_AssertContextActive(); @@ -322,4 +322,4 @@ void DGL_CullFace(DGLenum cull); D_CMD(UpdateGammaRamp); -#endif // DENG_GL_MAIN_H +#endif // DE_GL_MAIN_H diff --git a/doomsday/apps/client/include/gl/gl_tex.h b/doomsday/apps/client/include/gl/gl_tex.h index 2c3eafd0fa..5aeced2e64 100644 --- a/doomsday/apps/client/include/gl/gl_tex.h +++ b/doomsday/apps/client/include/gl/gl_tex.h @@ -22,8 +22,8 @@ * 02110-1301 USA */ -#ifndef DENG_GL_IMAGE_MANIPULATION_H -#define DENG_GL_IMAGE_MANIPULATION_H +#ifndef DE_GL_IMAGE_MANIPULATION_H +#define DE_GL_IMAGE_MANIPULATION_H #include "misc/color.h" @@ -271,4 +271,4 @@ dd_bool GL_QuantizeImageToPalette(uint8_t *out, int outformat, void GL_DeSaturatePalettedImage(uint8_t *buffer, res::ColorPalette const &palette, int width, int height); -#endif // DENG_GL_IMAGE_MANIPULATION_H +#endif // DE_GL_IMAGE_MANIPULATION_H diff --git a/doomsday/apps/client/include/gl/gl_texmanager.h b/doomsday/apps/client/include/gl/gl_texmanager.h index 4270a31306..37aa516a75 100644 --- a/doomsday/apps/client/include/gl/gl_texmanager.h +++ b/doomsday/apps/client/include/gl/gl_texmanager.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_GL_TEXMANAGER_H -#define DENG_CLIENT_GL_TEXMANAGER_H +#ifndef DE_CLIENT_GL_TEXMANAGER_H +#define DE_CLIENT_GL_TEXMANAGER_H #ifndef __CLIENT__ # error "GL Texture Manager only exists in the Client" @@ -84,4 +84,4 @@ void GL_ReleaseTexturesForRawImages(); void GL_SetRawTexturesMinFilter(int minFilter); -#endif // DENG_CLIENT_GL_TEXMANAGER_H +#endif // DE_CLIENT_GL_TEXMANAGER_H diff --git a/doomsday/apps/client/include/gl/gltextureunit.h b/doomsday/apps/client/include/gl/gltextureunit.h index 778462f82c..23c9193118 100644 --- a/doomsday/apps/client/include/gl/gltextureunit.h +++ b/doomsday/apps/client/include/gl/gltextureunit.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_GLTEXTUREUNIT_H -#define DENG_CLIENT_GLTEXTUREUNIT_H +#ifndef DE_CLIENT_GLTEXTUREUNIT_H +#define DE_CLIENT_GLTEXTUREUNIT_H #include "ClientTexture" #include @@ -159,4 +159,4 @@ class GLTextureUnit } // namespace de -#endif // DENG_CLIENT_GLTEXTUREUNIT_H +#endif // DE_CLIENT_GLTEXTUREUNIT_H diff --git a/doomsday/apps/client/include/gl/svg.h b/doomsday/apps/client/include/gl/svg.h index 9e3675cd3e..79a5fc9b74 100644 --- a/doomsday/apps/client/include/gl/svg.h +++ b/doomsday/apps/client/include/gl/svg.h @@ -20,8 +20,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_REFRESH_SVG_H -#define LIBDENG_REFRESH_SVG_H +#ifndef DE_REFRESH_SVG_H +#define DE_REFRESH_SVG_H #include "api_svg.h" @@ -74,4 +74,4 @@ Svg* Svg_FromDef(svgid_t uniqueId, const def_svgline_t* lines, uint numLines); } // extern "C" #endif -#endif // LIBDENG_REFRESH_SVG_H +#endif // DE_REFRESH_SVG_H diff --git a/doomsday/apps/client/include/gl/sys_opengl.h b/doomsday/apps/client/include/gl/sys_opengl.h index 7cbcfa067e..fb857b99b1 100644 --- a/doomsday/apps/client/include/gl/sys_opengl.h +++ b/doomsday/apps/client/include/gl/sys_opengl.h @@ -25,8 +25,8 @@ * http://oss.sgi.com/projects/ogl-sample/ */ -#ifndef LIBDENG_SYSTEM_OPENGL_H -#define LIBDENG_SYSTEM_OPENGL_H +#ifndef DE_SYSTEM_OPENGL_H +#define DE_SYSTEM_OPENGL_H #ifdef __SERVER__ # define GL_CLAMP_TO_EDGE 0 @@ -161,4 +161,4 @@ de::String Sys_GLDescription(); #endif -#endif /* LIBDENG_SYSTEM_OPENGL_H */ +#endif /* DE_SYSTEM_OPENGL_H */ diff --git a/doomsday/apps/client/include/gl/texturecontent.h b/doomsday/apps/client/include/gl/texturecontent.h index 5547fde2d2..d9ecac8d45 100644 --- a/doomsday/apps/client/include/gl/texturecontent.h +++ b/doomsday/apps/client/include/gl/texturecontent.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_GL_TEXTURECONTENT_H -#define DENG_CLIENT_GL_TEXTURECONTENT_H +#ifndef DE_CLIENT_GL_TEXTURECONTENT_H +#define DE_CLIENT_GL_TEXTURECONTENT_H #include "api_gl.h" #include "gl/gl_defer.h" @@ -96,4 +96,4 @@ void GL_PrepareTextureContent(texturecontent_t &c, void GL_UploadTextureContent(texturecontent_t const &content, de::gl::UploadMethod method = de::gl::Deferred); -#endif // DENG_CLIENT_GL_TEXTURECONTENT_H +#endif // DE_CLIENT_GL_TEXTURECONTENT_H diff --git a/doomsday/apps/client/include/localplayer.h b/doomsday/apps/client/include/localplayer.h index 1640753999..bbee8cae26 100644 --- a/doomsday/apps/client/include/localplayer.h +++ b/doomsday/apps/client/include/localplayer.h @@ -33,7 +33,7 @@ class LocalPlayer LocalPlayer(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // CLIENT_LOCALPLAYER_H diff --git a/doomsday/apps/client/include/macx/cursor_macx.h b/doomsday/apps/client/include/macx/cursor_macx.h index 1a85bbb210..8c7d2dcec0 100644 --- a/doomsday/apps/client/include/macx/cursor_macx.h +++ b/doomsday/apps/client/include/macx/cursor_macx.h @@ -20,7 +20,7 @@ #ifndef CLIENT_MACX_CURSOR_H #define CLIENT_MACX_CURSOR_H -#if !defined (DENG_IOS) +#if !defined (DE_IOS) /** * Show or hide the mouse cursor. diff --git a/doomsday/apps/client/include/misc/color.h b/doomsday/apps/client/include/misc/color.h index 9313d7d154..bdc4b38c30 100644 --- a/doomsday/apps/client/include/misc/color.h +++ b/doomsday/apps/client/include/misc/color.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_DATA_COLOR_H -#define LIBDENG_DATA_COLOR_H +#ifndef DE_DATA_COLOR_H +#define DE_DATA_COLOR_H #ifdef __cplusplus extern "C" { @@ -62,4 +62,4 @@ float ColorRawf_AverageColorMulAlpha(ColorRawf* color); } // extern "C" #endif -#endif // LIBDENG_DATA_COLOR_H +#endif // DE_DATA_COLOR_H diff --git a/doomsday/apps/client/include/misc/face.h b/doomsday/apps/client/include/misc/face.h index e7a4c2568c..c01252d2c8 100644 --- a/doomsday/apps/client/include/misc/face.h +++ b/doomsday/apps/client/include/misc/face.h @@ -17,8 +17,8 @@ * 02110-1301 USA */ -#ifndef DENG_DATA_MESH_FACE_H -#define DENG_DATA_MESH_FACE_H +#ifndef DE_DATA_MESH_FACE_H +#define DE_DATA_MESH_FACE_H #include @@ -100,9 +100,9 @@ class Face : public MeshElement String description() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace de -#endif // DENG_DATA_MESH_FACE_H +#endif // DE_DATA_MESH_FACE_H diff --git a/doomsday/apps/client/include/misc/hedge.h b/doomsday/apps/client/include/misc/hedge.h index 5e785e89cd..aabffb0bb7 100644 --- a/doomsday/apps/client/include/misc/hedge.h +++ b/doomsday/apps/client/include/misc/hedge.h @@ -39,16 +39,16 @@ class HEdge : public MeshElement { public: /// Required vertex is missing. @ingroup errors - //DENG2_ERROR(MissingVertexError); + //DE_ERROR(MissingVertexError); /// Required twin half-edge is missing. @ingroup errors - DENG2_ERROR(MissingTwinError); + DE_ERROR(MissingTwinError); /// Required face is missing. @ingroup errors - //DENG2_ERROR(MissingFaceError); + //DE_ERROR(MissingFaceError); /// Required neighbor half-edge is missing. @ingroup errors - DENG2_ERROR(MissingNeighborError); + DE_ERROR(MissingNeighborError); public: HEdge(Mesh &mesh, Vertex &vertex); @@ -111,7 +111,7 @@ class HEdge : public MeshElement * @see hasFace() */ inline Face &face() const { - DENG2_ASSERT(_face != nullptr); + DE_ASSERT(_face != nullptr); return *_face; } @@ -198,7 +198,7 @@ class HEdge : public MeshElement world::Subsector *subsector() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) // Heavily used; visible for inline access: Vertex *_vertex; diff --git a/doomsday/apps/client/include/misc/ihplane.h b/doomsday/apps/client/include/misc/ihplane.h index e18c7ab6f5..4745b2f534 100644 --- a/doomsday/apps/client/include/misc/ihplane.h +++ b/doomsday/apps/client/include/misc/ihplane.h @@ -17,8 +17,8 @@ * 02110-1301 USA */ -#ifndef DENG_MATH_IHPLANE -#define DENG_MATH_IHPLANE +#ifndef DE_MATH_IHPLANE +#define DE_MATH_IHPLANE #include #include @@ -34,7 +34,7 @@ class IHPlane { public: /// An invalid reference to an intercept was specified. @ingroup errors - DENG2_ERROR(UnknownInterceptError); + DE_ERROR(UnknownInterceptError); /** * Interface for an intercept in the implementing half-plane. @@ -123,4 +123,4 @@ class IHPlane } // namespace de -#endif // DENG_MATH_IHPLANE +#endif // DE_MATH_IHPLANE diff --git a/doomsday/apps/client/include/misc/mesh.h b/doomsday/apps/client/include/misc/mesh.h index bf5bdddd34..e1b1bb95da 100644 --- a/doomsday/apps/client/include/misc/mesh.h +++ b/doomsday/apps/client/include/misc/mesh.h @@ -54,12 +54,12 @@ class Mesh */ class Element { - DENG2_NO_COPY (Element) - DENG2_NO_ASSIGN(Element) + DE_NO_COPY (Element) + DE_NO_ASSIGN(Element) public: /// Required map element is missing. @ingroup errors - DENG2_ERROR(MissingMapElementError); + DE_ERROR(MissingMapElementError); public: explicit Element(Mesh &mesh); @@ -197,7 +197,7 @@ class Mesh HEdges const &hedges() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; typedef Mesh::Element MeshElement; diff --git a/doomsday/apps/client/include/misc/r_util.h b/doomsday/apps/client/include/misc/r_util.h index 6a0eb5b452..6dc8799548 100644 --- a/doomsday/apps/client/include/misc/r_util.h +++ b/doomsday/apps/client/include/misc/r_util.h @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_REFRESH_UTIL_H -#define DENG_REFRESH_UTIL_H +#ifndef DE_REFRESH_UTIL_H +#define DE_REFRESH_UTIL_H #include #include @@ -127,4 +127,4 @@ bool R_GenerateTexCoords(de::Vec2f &s, de::Vec2f &t, de::Vec3d const &point, char const *R_NameForBlendMode(blendmode_t mode); -#endif // DENG_REFRESH_UTIL_H +#endif // DE_REFRESH_UTIL_H diff --git a/doomsday/apps/client/include/network/masterserver.h b/doomsday/apps/client/include/network/masterserver.h index 7b93128b8f..5c40e186ea 100644 --- a/doomsday/apps/client/include/network/masterserver.h +++ b/doomsday/apps/client/include/network/masterserver.h @@ -21,8 +21,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_MASTER_SERVER_H -#define LIBDENG_MASTER_SERVER_H +#ifndef DE_MASTER_SERVER_H +#define DE_MASTER_SERVER_H #include "dd_share.h" @@ -66,7 +66,7 @@ public slots: void requestFinished(QNetworkReply *reply); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; /** @@ -104,4 +104,4 @@ void N_MasterRequestList(void); */ int N_MasterGet(int index, de::shell::ServerInfo *info); -#endif // LIBDENG_MASTER_SERVER_H +#endif // DE_MASTER_SERVER_H diff --git a/doomsday/apps/client/include/network/monitor.h b/doomsday/apps/client/include/network/monitor.h index 2c9d53a617..94ca6aa02b 100644 --- a/doomsday/apps/client/include/network/monitor.h +++ b/doomsday/apps/client/include/network/monitor.h @@ -22,8 +22,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_NETWORK_MONITOR_H -#define LIBDENG_NETWORK_MONITOR_H +#ifndef DE_NETWORK_MONITOR_H +#define DE_NETWORK_MONITOR_H #include "dd_share.h" @@ -41,4 +41,4 @@ D_CMD(NetFreqs); #endif -#endif // LIBDENG_NETWORK_MONITOR_H +#endif // DE_NETWORK_MONITOR_H diff --git a/doomsday/apps/client/include/network/net_buf.h b/doomsday/apps/client/include/network/net_buf.h index 31c3895e26..07790dfa57 100644 --- a/doomsday/apps/client/include/network/net_buf.h +++ b/doomsday/apps/client/include/network/net_buf.h @@ -20,8 +20,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_NETWORK_BUFFER_H -#define LIBDENG_NETWORK_BUFFER_H +#ifndef DE_NETWORK_BUFFER_H +#define DE_NETWORK_BUFFER_H #include "dd_types.h" @@ -138,4 +138,4 @@ void N_PostMessage(netmessage_t *msg); } // extern "C" #endif -#endif /* LIBDENG_NETWORK_BUFFER_H */ +#endif /* DE_NETWORK_BUFFER_H */ diff --git a/doomsday/apps/client/include/network/net_demo.h b/doomsday/apps/client/include/network/net_demo.h index 83b32131a8..05c58a6489 100644 --- a/doomsday/apps/client/include/network/net_demo.h +++ b/doomsday/apps/client/include/network/net_demo.h @@ -21,8 +21,8 @@ * Demos. */ -#ifndef LIBDENG_DEMO_H -#define LIBDENG_DEMO_H +#ifndef DE_DEMO_H +#define DE_DEMO_H #ifdef __SERVER__ # error Demos are not available in a SERVER build @@ -55,4 +55,4 @@ void Demo_StopPlayback(void); } // extern "C" #endif -#endif /* LIBDENG_DEMO_H */ +#endif /* DE_DEMO_H */ diff --git a/doomsday/apps/client/include/network/net_main.h b/doomsday/apps/client/include/network/net_main.h index 7c806ca4ab..c4975c147d 100644 --- a/doomsday/apps/client/include/network/net_main.h +++ b/doomsday/apps/client/include/network/net_main.h @@ -21,8 +21,8 @@ * Network Subsystem. */ -#ifndef LIBDENG_NETWORK_H -#define LIBDENG_NETWORK_H +#ifndef DE_NETWORK_H +#define DE_NETWORK_H #include #include "dd_share.h" @@ -193,4 +193,4 @@ dd_bool Net_IsLocalPlayer(int pNum); de::String Net_UserAgent(); -#endif /* LIBDENG_NETWORK_H */ +#endif /* DE_NETWORK_H */ diff --git a/doomsday/apps/client/include/network/net_msg.h b/doomsday/apps/client/include/network/net_msg.h index d7e301b5a3..9f75d3d764 100644 --- a/doomsday/apps/client/include/network/net_msg.h +++ b/doomsday/apps/client/include/network/net_msg.h @@ -27,8 +27,8 @@ #include #include -DENG_EXTERN_C Writer1 *msgWriter; -DENG_EXTERN_C Reader1 *msgReader; +DE_EXTERN_C Writer1 *msgWriter; +DE_EXTERN_C Reader1 *msgReader; #ifdef __cplusplus extern "C" { diff --git a/doomsday/apps/client/include/network/protocol.h b/doomsday/apps/client/include/network/protocol.h index f2e7070ae3..b053697de7 100644 --- a/doomsday/apps/client/include/network/protocol.h +++ b/doomsday/apps/client/include/network/protocol.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_NETWORK_PROTOCOL_H -#define LIBDENG_NETWORK_PROTOCOL_H +#ifndef DE_NETWORK_PROTOCOL_H +#define DE_NETWORK_PROTOCOL_H /** * Server protocol version number. @@ -196,4 +196,4 @@ extern "C" { } // extern "C" #endif -#endif // LIBDENG_NETWORK_PROTOCOL_H +#endif // DE_NETWORK_PROTOCOL_H diff --git a/doomsday/apps/client/include/network/serverlink.h b/doomsday/apps/client/include/network/serverlink.h index 5566d68c86..328f05abb6 100644 --- a/doomsday/apps/client/include/network/serverlink.h +++ b/doomsday/apps/client/include/network/serverlink.h @@ -38,12 +38,12 @@ class ServerLink : public de::shell::AbstractLink Q_OBJECT public: - DENG2_DEFINE_AUDIENCE2(DiscoveryUpdate, void linkDiscoveryUpdate(ServerLink const &link)) - DENG2_DEFINE_AUDIENCE2(PingResponse, void pingResponse(de::Address const &, de::TimeSpan)) - DENG2_DEFINE_AUDIENCE2(MapOutline, void mapOutlineReceived(de::Address const &, de::shell::MapOutlinePacket const &)) + DE_DEFINE_AUDIENCE2(DiscoveryUpdate, void linkDiscoveryUpdate(ServerLink const &link)) + DE_DEFINE_AUDIENCE2(PingResponse, void pingResponse(de::Address const &, de::TimeSpan)) + DE_DEFINE_AUDIENCE2(MapOutline, void mapOutlineReceived(de::Address const &, de::shell::MapOutlinePacket const &)) - DENG2_DEFINE_AUDIENCE2(Join, void networkGameJoined()) - DENG2_DEFINE_AUDIENCE2(Leave, void networkGameLeft()) + DE_DEFINE_AUDIENCE2(Join, void networkGameJoined()) + DE_DEFINE_AUDIENCE2(Leave, void networkGameLeft()) enum Flag { @@ -169,7 +169,7 @@ protected slots: void initiateCommunications() override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; Q_DECLARE_OPERATORS_FOR_FLAGS(ServerLink::FoundMask) diff --git a/doomsday/apps/client/include/render/angleclipper.h b/doomsday/apps/client/include/render/angleclipper.h index c7724466cd..0bdf43f185 100644 --- a/doomsday/apps/client/include/render/angleclipper.h +++ b/doomsday/apps/client/include/render/angleclipper.h @@ -136,7 +136,7 @@ class AngleClipper */ de::dint checkRangeFromViewRelPoints(de::Vec2d const &from, de::Vec2d const &to); -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG /** * A debugging aid: checks if clipnode links are valid. */ @@ -144,7 +144,7 @@ class AngleClipper #endif private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // CLIENT_RENDER_ANGLECLIPPER diff --git a/doomsday/apps/client/include/render/billboard.h b/doomsday/apps/client/include/render/billboard.h index e36462d586..79325f02f0 100644 --- a/doomsday/apps/client/include/render/billboard.h +++ b/doomsday/apps/client/include/render/billboard.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_RENDER_BILLBOARD_H -#define DENG_CLIENT_RENDER_BILLBOARD_H +#ifndef DE_CLIENT_RENDER_BILLBOARD_H +#define DE_CLIENT_RENDER_BILLBOARD_H #include "dd_types.h" #include "ClientMaterial" @@ -122,14 +122,14 @@ struct drawflareparams_t de::dint lumIdx; }; -DENG_EXTERN_C de::dint alwaysAlign; -DENG_EXTERN_C de::dint spriteLight; -DENG_EXTERN_C de::dint useSpriteAlpha; -DENG_EXTERN_C de::dint useSpriteBlend; -DENG_EXTERN_C de::dint noSpriteZWrite; -DENG_EXTERN_C de::dbyte noSpriteTrans; -DENG_EXTERN_C de::dbyte devNoSprites; +DE_EXTERN_C de::dint alwaysAlign; +DE_EXTERN_C de::dint spriteLight; +DE_EXTERN_C de::dint useSpriteAlpha; +DE_EXTERN_C de::dint useSpriteBlend; +DE_EXTERN_C de::dint noSpriteZWrite; +DE_EXTERN_C de::dbyte noSpriteTrans; +DE_EXTERN_C de::dbyte devNoSprites; -DENG_EXTERN_C void Rend_SpriteRegister(); +DE_EXTERN_C void Rend_SpriteRegister(); #endif // CLIENT_RENDER_BILLBOARD_H diff --git a/doomsday/apps/client/include/render/blockmapvisual.h b/doomsday/apps/client/include/render/blockmapvisual.h index 176b57328c..5218379a5e 100644 --- a/doomsday/apps/client/include/render/blockmapvisual.h +++ b/doomsday/apps/client/include/render/blockmapvisual.h @@ -18,17 +18,17 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_RENDER_BLOCKMAPVISUAL_H -#define DENG_CLIENT_RENDER_BLOCKMAPVISUAL_H +#ifndef DE_CLIENT_RENDER_BLOCKMAPVISUAL_H +#define DE_CLIENT_RENDER_BLOCKMAPVISUAL_H #include -DENG_EXTERN_C byte bmapShowDebug; ///< cvar -DENG_EXTERN_C float bmapDebugSize; ///< cvar +DE_EXTERN_C byte bmapShowDebug; ///< cvar +DE_EXTERN_C float bmapDebugSize; ///< cvar /** * Render the Blockmap debugging visual. */ -DENG_EXTERN_C void Rend_BlockmapDebug(); +DE_EXTERN_C void Rend_BlockmapDebug(); -#endif // DENG_CLIENT_RENDER_BLOCKMAPVISUAL_H +#endif // DE_CLIENT_RENDER_BLOCKMAPVISUAL_H diff --git a/doomsday/apps/client/include/render/cameralensfx.h b/doomsday/apps/client/include/render/cameralensfx.h index d9a774258f..51c2d98cbf 100644 --- a/doomsday/apps/client/include/render/cameralensfx.h +++ b/doomsday/apps/client/include/render/cameralensfx.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_CAMERALENSFX_H -#define DENG_CLIENT_CAMERALENSFX_H +#ifndef DE_CLIENT_CAMERALENSFX_H +#define DE_CLIENT_CAMERALENSFX_H #include "ilightsource.h" @@ -56,4 +56,4 @@ void LensFx_Draw(int playerNum); */ void LensFx_MarkLightVisible(IPointLightSource const &lightSource); -#endif // DENG_CLIENT_CAMERALENSFX_H +#endif // DE_CLIENT_CAMERALENSFX_H diff --git a/doomsday/apps/client/include/render/consoleeffect.h b/doomsday/apps/client/include/render/consoleeffect.h index 158fe7a600..6a2c62ed1e 100644 --- a/doomsday/apps/client/include/render/consoleeffect.h +++ b/doomsday/apps/client/include/render/consoleeffect.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_CONSOLEEFFECT_H -#define DENG_CLIENT_CONSOLEEFFECT_H +#ifndef DE_CLIENT_CONSOLEEFFECT_H +#define DE_CLIENT_CONSOLEEFFECT_H #include #include @@ -79,7 +79,7 @@ class ConsoleEffect virtual void endFrame(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; /// Dynamic stack of effects. (Used currently as a fixed array, though.) @@ -98,4 +98,4 @@ struct ConsoleEffectStack } }; -#endif // DENG_CLIENT_CONSOLEEFFECT_H +#endif // DE_CLIENT_CONSOLEEFFECT_H diff --git a/doomsday/apps/client/include/render/decoration.h b/doomsday/apps/client/include/render/decoration.h index c5c7938174..576a1a9cf5 100644 --- a/doomsday/apps/client/include/render/decoration.h +++ b/doomsday/apps/client/include/render/decoration.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_RENDER_DECORATION_H -#define DENG_CLIENT_RENDER_DECORATION_H +#ifndef DE_CLIENT_RENDER_DECORATION_H +#define DE_CLIENT_RENDER_DECORATION_H #include #include @@ -40,7 +40,7 @@ class Decoration : public world::MapObject { public: /// Required surface is missing. @ingroup errors - DENG2_ERROR(MissingSurfaceError); + DE_ERROR(MissingSurfaceError); public: /** @@ -83,7 +83,7 @@ class Decoration : public world::MapObject void setSurface(Surface *newSurface); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_RENDER_DECORATION_H +#endif // DE_CLIENT_RENDER_DECORATION_H diff --git a/doomsday/apps/client/include/render/drawlist.h b/doomsday/apps/client/include/render/drawlist.h index 8b4c2b2818..d1878d935f 100644 --- a/doomsday/apps/client/include/render/drawlist.h +++ b/doomsday/apps/client/include/render/drawlist.h @@ -112,12 +112,12 @@ class DrawList {} inline de::GLTextureUnit &unit(int index) { - DENG2_ASSERT(index >= 0 && index < NUM_TEXTURE_UNITS); + DE_ASSERT(index >= 0 && index < NUM_TEXTURE_UNITS); return texunits[index]; } inline de::GLTextureUnit const &unit(int index) const { - DENG2_ASSERT(index >= 0 && index < NUM_TEXTURE_UNITS); + DE_ASSERT(index >= 0 && index < NUM_TEXTURE_UNITS); return texunits[index]; } }; @@ -226,7 +226,7 @@ class DrawList static void reserveSpace(Indices &idx, uint count); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; typedef DrawList::Spec DrawListSpec; diff --git a/doomsday/apps/client/include/render/drawlists.h b/doomsday/apps/client/include/render/drawlists.h index f7eca01ad8..dd87660246 100644 --- a/doomsday/apps/client/include/render/drawlists.h +++ b/doomsday/apps/client/include/render/drawlists.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_RENDER_DRAWLISTS_H -#define DENG_CLIENT_RENDER_DRAWLISTS_H +#ifndef DE_CLIENT_RENDER_DRAWLISTS_H +#define DE_CLIENT_RENDER_DRAWLISTS_H #include "DrawList" #include @@ -64,7 +64,7 @@ class DrawLists void clear(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_RENDER_DRAWLISTS_H +#endif // DE_CLIENT_RENDER_DRAWLISTS_H diff --git a/doomsday/apps/client/include/render/environ.h b/doomsday/apps/client/include/render/environ.h index 74185f3e41..401b53174d 100644 --- a/doomsday/apps/client/include/render/environ.h +++ b/doomsday/apps/client/include/render/environ.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_RENDER_ENVIRON_H -#define DENG_CLIENT_RENDER_ENVIRON_H +#ifndef DE_CLIENT_RENDER_ENVIRON_H +#define DE_CLIENT_RENDER_ENVIRON_H #include @@ -46,9 +46,9 @@ class Environment de::GLTexture const &reflectionInSubsector(world::Subsector const *subsector) const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace render -#endif // DENG_CLIENT_RENDER_ENVIRON_H +#endif // DE_CLIENT_RENDER_ENVIRON_H diff --git a/doomsday/apps/client/include/render/fx/bloom.h b/doomsday/apps/client/include/render/fx/bloom.h index ba96b4e63a..7b6e264726 100644 --- a/doomsday/apps/client/include/render/fx/bloom.h +++ b/doomsday/apps/client/include/render/fx/bloom.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_FX_BLOOM_H -#define DENG_CLIENT_FX_BLOOM_H +#ifndef DE_CLIENT_FX_BLOOM_H +#define DE_CLIENT_FX_BLOOM_H #include "render/consoleeffect.h" @@ -42,9 +42,9 @@ class Bloom : public ConsoleEffect static float intensity(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace fx -#endif // DENG_CLIENT_FX_BLOOM_H +#endif // DE_CLIENT_FX_BLOOM_H diff --git a/doomsday/apps/client/include/render/fx/colorfilter.h b/doomsday/apps/client/include/render/fx/colorfilter.h index 35a6c48147..9a08f3017c 100644 --- a/doomsday/apps/client/include/render/fx/colorfilter.h +++ b/doomsday/apps/client/include/render/fx/colorfilter.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_FX_COLORFILTERCONSOLEEFFECT_H -#define DENG_CLIENT_FX_COLORFILTERCONSOLEEFFECT_H +#ifndef DE_CLIENT_FX_COLORFILTERCONSOLEEFFECT_H +#define DE_CLIENT_FX_COLORFILTERCONSOLEEFFECT_H #include "render/consoleeffect.h" @@ -38,4 +38,4 @@ class ColorFilter : public ConsoleEffect } // namespace fx -#endif // DENG_CLIENT_FX_COLORFILTERCONSOLEEFFECT_H +#endif // DE_CLIENT_FX_COLORFILTERCONSOLEEFFECT_H diff --git a/doomsday/apps/client/include/render/fx/lensflares.h b/doomsday/apps/client/include/render/fx/lensflares.h index f1f8baf6f1..eef6d0d55d 100644 --- a/doomsday/apps/client/include/render/fx/lensflares.h +++ b/doomsday/apps/client/include/render/fx/lensflares.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_FX_LENSFLARES_H -#define DENG_CLIENT_FX_LENSFLARES_H +#ifndef DE_CLIENT_FX_LENSFLARES_H +#define DE_CLIENT_FX_LENSFLARES_H #include "render/consoleeffect.h" #include "render/ilightsource.h" @@ -44,9 +44,9 @@ class LensFlares : public ConsoleEffect static void consoleRegister(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace fx -#endif // DENG_CLIENT_FX_LENSFLARES_H +#endif // DE_CLIENT_FX_LENSFLARES_H diff --git a/doomsday/apps/client/include/render/fx/vignette.h b/doomsday/apps/client/include/render/fx/vignette.h index 40ae6bdaaa..c635b1c1c8 100644 --- a/doomsday/apps/client/include/render/fx/vignette.h +++ b/doomsday/apps/client/include/render/fx/vignette.h @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_FX_VIGNETTE_H -#define DENG_CLIENT_FX_VIGNETTE_H +#ifndef DE_CLIENT_FX_VIGNETTE_H +#define DE_CLIENT_FX_VIGNETTE_H #include "render/consoleeffect.h" @@ -46,4 +46,4 @@ class Vignette : public ConsoleEffect } // namespace fx -#endif // DENG_CLIENT_FX_VIGNETTE_H +#endif // DE_CLIENT_FX_VIGNETTE_H diff --git a/doomsday/apps/client/include/render/ilightsource.h b/doomsday/apps/client/include/render/ilightsource.h index b1fb021529..d00f23cb01 100644 --- a/doomsday/apps/client/include/render/ilightsource.h +++ b/doomsday/apps/client/include/render/ilightsource.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_ILIGHTSOURCE_H -#define DENG_CLIENT_ILIGHTSOURCE_H +#ifndef DE_CLIENT_ILIGHTSOURCE_H +#define DE_CLIENT_ILIGHTSOURCE_H #include #include @@ -92,4 +92,4 @@ class IPointLightSource : public ILightSource virtual de::dfloat lightSourceRadius() const = 0; }; -#endif // DENG_CLIENT_ILIGHTSOURCE_H +#endif // DE_CLIENT_ILIGHTSOURCE_H diff --git a/doomsday/apps/client/include/render/lightdecoration.h b/doomsday/apps/client/include/render/lightdecoration.h index 1f66a2c033..3494edde96 100644 --- a/doomsday/apps/client/include/render/lightdecoration.h +++ b/doomsday/apps/client/include/render/lightdecoration.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_RENDER_LIGHTDECORATION_H -#define DENG_CLIENT_RENDER_LIGHTDECORATION_H +#ifndef DE_CLIENT_RENDER_LIGHTDECORATION_H +#define DE_CLIENT_RENDER_LIGHTDECORATION_H #include "Decoration" #include "Lumobj" @@ -77,4 +77,4 @@ class LightDecoration : public Decoration, public Lumobj::Source Lumobj *generateLumobj() const; }; -#endif // DENG_CLIENT_RENDER_LIGHTDECORATION_H +#endif // DE_CLIENT_RENDER_LIGHTDECORATION_H diff --git a/doomsday/apps/client/include/render/lumobj.h b/doomsday/apps/client/include/render/lumobj.h index 6868031368..f1b0f16b13 100644 --- a/doomsday/apps/client/include/render/lumobj.h +++ b/doomsday/apps/client/include/render/lumobj.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_RENDER_LUMOBJ_H -#define DENG_CLIENT_RENDER_LUMOBJ_H +#ifndef DE_CLIENT_RENDER_LUMOBJ_H +#define DE_CLIENT_RENDER_LUMOBJ_H #include @@ -248,7 +248,7 @@ class Lumobj : public world::MapObject void generateFlare(de::Vec3d const &eye, double distFromEye); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_RENDER_LUMOBJ_H +#endif // DE_CLIENT_RENDER_LUMOBJ_H diff --git a/doomsday/apps/client/include/render/model.h b/doomsday/apps/client/include/render/model.h index 00ee07203a..968beb89fd 100644 --- a/doomsday/apps/client/include/render/model.h +++ b/doomsday/apps/client/include/render/model.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_RENDER_MODEL_H -#define DENG_CLIENT_RENDER_MODEL_H +#ifndef DE_CLIENT_RENDER_MODEL_H +#define DE_CLIENT_RENDER_MODEL_H #include #include @@ -109,5 +109,5 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Model::Flags) } // namespace render -#endif // DENG_CLIENT_RENDER_MODEL_H +#endif // DE_CLIENT_RENDER_MODEL_H diff --git a/doomsday/apps/client/include/render/modelloader.h b/doomsday/apps/client/include/render/modelloader.h index 6b7726e04a..43d730d905 100644 --- a/doomsday/apps/client/include/render/modelloader.h +++ b/doomsday/apps/client/include/render/modelloader.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_MODELLOADER_H -#define DENG_CLIENT_MODELLOADER_H +#ifndef DE_CLIENT_MODELLOADER_H +#define DE_CLIENT_MODELLOADER_H #include #include @@ -30,10 +30,10 @@ namespace render { class ModelLoader { public: - DENG2_DEFINE_AUDIENCE2(NewProgram, void newProgramCreated(de::GLProgram &)) + DE_DEFINE_AUDIENCE2(NewProgram, void newProgramCreated(de::GLProgram &)) - DENG2_ERROR(DefinitionError); - DENG2_ERROR(TextureMappingError); + DE_ERROR(DefinitionError); + DE_ERROR(TextureMappingError); public: ModelLoader(); @@ -74,9 +74,9 @@ class ModelLoader static de::String const DEF_RENDER; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace render -#endif // DENG_CLIENT_MODELLOADER_H +#endif // DE_CLIENT_MODELLOADER_H diff --git a/doomsday/apps/client/include/render/modelrenderer.h b/doomsday/apps/client/include/render/modelrenderer.h index ce72cf7dd0..862cb374c8 100644 --- a/doomsday/apps/client/include/render/modelrenderer.h +++ b/doomsday/apps/client/include/render/modelrenderer.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_MODELRENDERER_H -#define DENG_CLIENT_MODELRENDERER_H +#ifndef DE_CLIENT_MODELRENDERER_H +#define DE_CLIENT_MODELRENDERER_H #include #include @@ -97,7 +97,7 @@ class ModelRenderer static void initBindings(de::Binder &binder, de::Record &module); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_MODELRENDERER_H +#endif // DE_CLIENT_MODELRENDERER_H diff --git a/doomsday/apps/client/include/render/playerweaponanimator.h b/doomsday/apps/client/include/render/playerweaponanimator.h index 306327a902..f02e7f1643 100644 --- a/doomsday/apps/client/include/render/playerweaponanimator.h +++ b/doomsday/apps/client/include/render/playerweaponanimator.h @@ -57,7 +57,7 @@ class PlayerWeaponAnimator void advanceTime(de::TimeSpan const &elapsed); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace render diff --git a/doomsday/apps/client/include/render/projectionlist.h b/doomsday/apps/client/include/render/projectionlist.h index 0602f573d9..2e26589518 100644 --- a/doomsday/apps/client/include/render/projectionlist.h +++ b/doomsday/apps/client/include/render/projectionlist.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_RENDER_PROJECTIONLIST_H -#define DENG_CLIENT_RENDER_PROJECTIONLIST_H +#ifndef DE_CLIENT_RENDER_PROJECTIONLIST_H +#define DE_CLIENT_RENDER_PROJECTIONLIST_H #include "projectedtexturedata.h" @@ -46,5 +46,5 @@ struct ProjectionList static Node *newNode(); }; -#endif // DENG_CLIENT_RENDER_PROJECTIONLIST_H +#endif // DE_CLIENT_RENDER_PROJECTIONLIST_H diff --git a/doomsday/apps/client/include/render/r_draw.h b/doomsday/apps/client/include/render/r_draw.h index 74b9aecad7..b7ac91c4fb 100644 --- a/doomsday/apps/client/include/render/r_draw.h +++ b/doomsday/apps/client/include/render/r_draw.h @@ -20,8 +20,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_RENDER_MISC_H -#define DENG_CLIENT_RENDER_MISC_H +#ifndef DE_CLIENT_RENDER_MISC_H +#define DE_CLIENT_RENDER_MISC_H #include "ClientTexture" #include "TextureVariantSpec" @@ -44,4 +44,4 @@ void R_DrawPatch(ClientTexture &texture, int x, int y, int w, int h, bool useOff void R_DrawPatchTiled(ClientTexture &texture, int x, int y, int w, int h, de::gl::Wrapping wrapS, de::gl::Wrapping wrapT); -#endif // DENG_CLIENT_RENDER_MISC_H +#endif // DE_CLIENT_RENDER_MISC_H diff --git a/doomsday/apps/client/include/render/r_main.h b/doomsday/apps/client/include/render/r_main.h index 49e528e6b7..b5f251f0ae 100644 --- a/doomsday/apps/client/include/render/r_main.h +++ b/doomsday/apps/client/include/render/r_main.h @@ -18,20 +18,20 @@ * 02110-1301 USA */ -#ifndef DENG_RENDER_R_MAIN_H -#define DENG_RENDER_R_MAIN_H +#ifndef DE_RENDER_R_MAIN_H +#define DE_RENDER_R_MAIN_H #include "dd_types.h" -DENG_EXTERN_C int levelFullBright; +DE_EXTERN_C int levelFullBright; -DENG_EXTERN_C float pspOffset[2], pspLightLevelMultiplier; -DENG_EXTERN_C int psp3d; -DENG_EXTERN_C float weaponOffsetScale, weaponFOVShift; -DENG_EXTERN_C int weaponOffsetScaleY; -DENG_EXTERN_C byte weaponScaleMode; // cvar +DE_EXTERN_C float pspOffset[2], pspLightLevelMultiplier; +DE_EXTERN_C int psp3d; +DE_EXTERN_C float weaponOffsetScale, weaponFOVShift; +DE_EXTERN_C int weaponOffsetScaleY; +DE_EXTERN_C byte weaponScaleMode; // cvar -DENG_EXTERN_C fixed_t fineTangent[FINEANGLES / 2]; +DE_EXTERN_C fixed_t fineTangent[FINEANGLES / 2]; /** * Draws 2D HUD sprites. If they were already drawn 3D, this won't do anything. @@ -43,4 +43,4 @@ void Rend_Draw2DPlayerSprites(); */ void Rend_Draw3DPlayerSprites(); -#endif // DENG_RENDER_R_MAIN_H +#endif // DE_RENDER_R_MAIN_H diff --git a/doomsday/apps/client/include/render/r_things.h b/doomsday/apps/client/include/render/r_things.h index c4ec0e4684..fd92944561 100644 --- a/doomsday/apps/client/include/render/r_things.h +++ b/doomsday/apps/client/include/render/r_things.h @@ -19,8 +19,8 @@ */ #ifdef __CLIENT__ -#ifndef DENG_CLIENT_RENDER_THINGS_H -#define DENG_CLIENT_RENDER_THINGS_H +#ifndef DE_CLIENT_RENDER_THINGS_H +#define DE_CLIENT_RENDER_THINGS_H #include "world/p_object.h" @@ -29,5 +29,5 @@ */ void R_ProjectSprite(mobj_t &mob); -#endif // DENG_CLIENT_RENDER_THINGS_H +#endif // DE_CLIENT_RENDER_THINGS_H #endif // __CLIENT__ diff --git a/doomsday/apps/client/include/render/rend_fakeradio.h b/doomsday/apps/client/include/render/rend_fakeradio.h index 8b7aed3484..8e56d224d5 100644 --- a/doomsday/apps/client/include/render/rend_fakeradio.h +++ b/doomsday/apps/client/include/render/rend_fakeradio.h @@ -31,8 +31,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_RENDER_FAKERADIO -#define DENG_CLIENT_RENDER_FAKERADIO +#ifndef DE_CLIENT_RENDER_FAKERADIO +#define DE_CLIENT_RENDER_FAKERADIO #include "WallEdge" @@ -61,8 +61,8 @@ struct edgespan_t de::dfloat shift; }; -DENG2_EXTERN_C de::dint rendFakeRadio; -DENG2_EXTERN_C byte devFakeRadioUpdate; +DE_EXTERN_C de::dint rendFakeRadio; +DE_EXTERN_C byte devFakeRadioUpdate; /** * Render FakeRadio for the specified wall section. Generates and then draws all shadow geometry @@ -88,4 +88,4 @@ void Rend_DrawFlatRadio(world::ConvexSubspace const &subspace); */ void Rend_RadioRegister(); -#endif // DENG_CLIENT_RENDER_FAKERADIO +#endif // DE_CLIENT_RENDER_FAKERADIO diff --git a/doomsday/apps/client/include/render/rend_font.h b/doomsday/apps/client/include/render/rend_font.h index 67da696e3a..bdc773ed08 100644 --- a/doomsday/apps/client/include/render/rend_font.h +++ b/doomsday/apps/client/include/render/rend_font.h @@ -21,8 +21,8 @@ * Font Renderer */ -#ifndef LIBDENG_FONT_RENDERER -#define LIBDENG_FONT_RENDERER +#ifndef DE_FONT_RENDERER +#define DE_FONT_RENDERER #ifdef __cplusplus extern "C" { @@ -68,4 +68,4 @@ int FR_GlyphTopToAscent(const char* text); } // extern "C" #endif -#endif /* LIBDENG_FONT_RENDERER */ +#endif /* DE_FONT_RENDERER */ diff --git a/doomsday/apps/client/include/render/rend_halo.h b/doomsday/apps/client/include/render/rend_halo.h index 3025fc8cdb..e91501a844 100644 --- a/doomsday/apps/client/include/render/rend_halo.h +++ b/doomsday/apps/client/include/render/rend_halo.h @@ -17,16 +17,16 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_RENDER_HALO_H -#define DENG_CLIENT_RENDER_HALO_H +#ifndef DE_CLIENT_RENDER_HALO_H +#define DE_CLIENT_RENDER_HALO_H #include #include "TextureVariantSpec" -DENG_EXTERN_C int haloOccludeSpeed; -DENG_EXTERN_C int haloMode, haloRealistic, haloBright, haloSize; -DENG_EXTERN_C float haloFadeMax, haloFadeMin, minHaloSize; +DE_EXTERN_C int haloOccludeSpeed; +DE_EXTERN_C int haloMode, haloRealistic, haloBright, haloSize; +DE_EXTERN_C float haloFadeMax, haloFadeMin, minHaloSize; void H_Register(); @@ -68,4 +68,4 @@ bool H_RenderHalo(de::Vec3d const &origin, float size, // Console commands. D_CMD(FlareConfig); -#endif // DENG_CLIENT_RENDER_HALO_H +#endif // DE_CLIENT_RENDER_HALO_H diff --git a/doomsday/apps/client/include/render/rend_main.h b/doomsday/apps/client/include/render/rend_main.h index f356fcc07c..7d8d126dcf 100644 --- a/doomsday/apps/client/include/render/rend_main.h +++ b/doomsday/apps/client/include/render/rend_main.h @@ -61,9 +61,9 @@ namespace world { #define SHADOW_SURFACE_LUMINOSITY_ATTRIBUTION_MIN (.05f) -DENG_EXTERN_C de::Vec3d vOrigin; // Y/Z swizzled for drawing -DENG_EXTERN_C float vang, vpitch, yfov; -DENG_EXTERN_C float viewsidex, viewsidey; +DE_EXTERN_C de::Vec3d vOrigin; // Y/Z swizzled for drawing +DE_EXTERN_C float vang, vpitch, yfov; +DE_EXTERN_C float viewsidex, viewsidey; struct FogParams { @@ -75,73 +75,73 @@ struct FogParams extern FogParams fogParams; -DENG_EXTERN_C byte smoothTexAnim, devMobjVLights; +DE_EXTERN_C byte smoothTexAnim, devMobjVLights; -DENG_EXTERN_C int renderTextures; /// @c 0= no textures, @c 1= normal mode, @c 2= lighting debug -#if defined (DENG_OPENGL) -DENG_EXTERN_C int renderWireframe; +DE_EXTERN_C int renderTextures; /// @c 0= no textures, @c 1= normal mode, @c 2= lighting debug +#if defined (DE_OPENGL) +DE_EXTERN_C int renderWireframe; #endif -//DENG_EXTERN_C int useMultiTexLights; -//DENG_EXTERN_C int useMultiTexDetails; - -DENG_EXTERN_C int dynlightBlend; - -//DENG_EXTERN_C int torchAdditive; -DENG_EXTERN_C de::Vec3f torchColor; - -DENG_EXTERN_C int rAmbient; -DENG_EXTERN_C float rendLightDistanceAttenuation; -DENG_EXTERN_C int rendLightAttenuateFixedColormap; -DENG_EXTERN_C float rendLightWallAngle; -DENG_EXTERN_C byte rendLightWallAngleSmooth; -DENG_EXTERN_C float rendSkyLight; // cvar -DENG_EXTERN_C byte rendSkyLightAuto; // cvar -DENG_EXTERN_C float lightModRange[255]; -DENG_EXTERN_C int extraLight; -DENG_EXTERN_C float extraLightDelta; - -DENG_EXTERN_C int devRendSkyMode; -DENG_EXTERN_C int gameDrawHUD; - -//DENG_EXTERN_C int useBias; - -DENG_EXTERN_C int useDynLights; -DENG_EXTERN_C float dynlightFactor, dynlightFogBright; -DENG_EXTERN_C int rendMaxLumobjs; - -DENG_EXTERN_C int useGlowOnWalls; -DENG_EXTERN_C float glowFactor, glowHeightFactor; -DENG_EXTERN_C int glowHeightMax; - -DENG_EXTERN_C int useShadows; -DENG_EXTERN_C float shadowFactor; -DENG_EXTERN_C int shadowMaxRadius; -DENG_EXTERN_C int shadowMaxDistance; - -DENG_EXTERN_C byte useLightDecorations; - -DENG_EXTERN_C int useShinySurfaces; - -DENG_EXTERN_C float detailFactor, detailScale; - -DENG_EXTERN_C int ratioLimit; -DENG_EXTERN_C int mipmapping, filterUI, texQuality, filterSprites; -DENG_EXTERN_C int texMagMode, texAniso; -DENG_EXTERN_C int useSmartFilter; -DENG_EXTERN_C int texMagMode; -DENG_EXTERN_C int glmode[6]; -DENG_EXTERN_C dd_bool fillOutlines; -//DENG_EXTERN_C dd_bool noHighResTex; -//DENG_EXTERN_C dd_bool noHighResPatches; -//DENG_EXTERN_C dd_bool highResWithPWAD; -DENG_EXTERN_C byte loadExtAlways; - -DENG_EXTERN_C int devNoCulling; -DENG_EXTERN_C byte devRendSkyAlways; -DENG_EXTERN_C byte rendInfoLums; -DENG_EXTERN_C byte devDrawLums; - -DENG_EXTERN_C byte freezeRLs; +//DE_EXTERN_C int useMultiTexLights; +//DE_EXTERN_C int useMultiTexDetails; + +DE_EXTERN_C int dynlightBlend; + +//DE_EXTERN_C int torchAdditive; +DE_EXTERN_C de::Vec3f torchColor; + +DE_EXTERN_C int rAmbient; +DE_EXTERN_C float rendLightDistanceAttenuation; +DE_EXTERN_C int rendLightAttenuateFixedColormap; +DE_EXTERN_C float rendLightWallAngle; +DE_EXTERN_C byte rendLightWallAngleSmooth; +DE_EXTERN_C float rendSkyLight; // cvar +DE_EXTERN_C byte rendSkyLightAuto; // cvar +DE_EXTERN_C float lightModRange[255]; +DE_EXTERN_C int extraLight; +DE_EXTERN_C float extraLightDelta; + +DE_EXTERN_C int devRendSkyMode; +DE_EXTERN_C int gameDrawHUD; + +//DE_EXTERN_C int useBias; + +DE_EXTERN_C int useDynLights; +DE_EXTERN_C float dynlightFactor, dynlightFogBright; +DE_EXTERN_C int rendMaxLumobjs; + +DE_EXTERN_C int useGlowOnWalls; +DE_EXTERN_C float glowFactor, glowHeightFactor; +DE_EXTERN_C int glowHeightMax; + +DE_EXTERN_C int useShadows; +DE_EXTERN_C float shadowFactor; +DE_EXTERN_C int shadowMaxRadius; +DE_EXTERN_C int shadowMaxDistance; + +DE_EXTERN_C byte useLightDecorations; + +DE_EXTERN_C int useShinySurfaces; + +DE_EXTERN_C float detailFactor, detailScale; + +DE_EXTERN_C int ratioLimit; +DE_EXTERN_C int mipmapping, filterUI, texQuality, filterSprites; +DE_EXTERN_C int texMagMode, texAniso; +DE_EXTERN_C int useSmartFilter; +DE_EXTERN_C int texMagMode; +DE_EXTERN_C int glmode[6]; +DE_EXTERN_C dd_bool fillOutlines; +//DE_EXTERN_C dd_bool noHighResTex; +//DE_EXTERN_C dd_bool noHighResPatches; +//DE_EXTERN_C dd_bool highResWithPWAD; +DE_EXTERN_C byte loadExtAlways; + +DE_EXTERN_C int devNoCulling; +DE_EXTERN_C byte devRendSkyAlways; +DE_EXTERN_C byte rendInfoLums; +DE_EXTERN_C byte devDrawLums; + +DE_EXTERN_C byte freezeRLs; struct ResourceConfigVars { diff --git a/doomsday/apps/client/include/render/rend_model.h b/doomsday/apps/client/include/render/rend_model.h index ed4e7904fb..dc2e80c203 100644 --- a/doomsday/apps/client/include/render/rend_model.h +++ b/doomsday/apps/client/include/render/rend_model.h @@ -69,16 +69,16 @@ struct drawmodel2params_t render::StateAnimator const *animator; }; -DENG_EXTERN_C de::dbyte useModels; -DENG_EXTERN_C de::dint modelLight; -DENG_EXTERN_C de::dint frameInter; -DENG_EXTERN_C de::dfloat modelAspectMod; -DENG_EXTERN_C de::dint mirrorHudModels; -//DENG_EXTERN_C de::dint modelShinyMultitex; -DENG_EXTERN_C de::dfloat modelSpinSpeed; -DENG_EXTERN_C de::dint maxModelDistance; -DENG_EXTERN_C de::dfloat rendModelLOD; -DENG_EXTERN_C de::dbyte precacheSkins; +DE_EXTERN_C de::dbyte useModels; +DE_EXTERN_C de::dint modelLight; +DE_EXTERN_C de::dint frameInter; +DE_EXTERN_C de::dfloat modelAspectMod; +DE_EXTERN_C de::dint mirrorHudModels; +//DE_EXTERN_C de::dint modelShinyMultitex; +DE_EXTERN_C de::dfloat modelSpinSpeed; +DE_EXTERN_C de::dint maxModelDistance; +DE_EXTERN_C de::dfloat rendModelLOD; +DE_EXTERN_C de::dbyte precacheSkins; /** * Registers the console commands and variables used by this module. diff --git a/doomsday/apps/client/include/render/rend_particle.h b/doomsday/apps/client/include/render/rend_particle.h index 76cde0ebfa..9ab0717f5d 100644 --- a/doomsday/apps/client/include/render/rend_particle.h +++ b/doomsday/apps/client/include/render/rend_particle.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_RENDER_PARTICLE_H -#define DENG_CLIENT_RENDER_PARTICLE_H +#ifndef DE_CLIENT_RENDER_PARTICLE_H +#define DE_CLIENT_RENDER_PARTICLE_H namespace world { class Map; } @@ -41,7 +41,7 @@ enum ParticleType PTC_MODEL = 1000 }; -DENG_EXTERN_C de::dbyte useParticles; +DE_EXTERN_C de::dbyte useParticles; void Rend_ParticleRegister(); @@ -68,4 +68,4 @@ void Rend_ParticleReleaseExtraTextures(); */ void Rend_RenderParticles(world::Map &map); -#endif // DENG_CLIENT_RENDER_PARTICLE_H +#endif // DE_CLIENT_RENDER_PARTICLE_H diff --git a/doomsday/apps/client/include/render/rendersystem.h b/doomsday/apps/client/include/render/rendersystem.h index 7206509ca5..138aafbd4e 100644 --- a/doomsday/apps/client/include/render/rendersystem.h +++ b/doomsday/apps/client/include/render/rendersystem.h @@ -143,7 +143,7 @@ class RenderSystem : public de::System static void consoleRegister(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // CLIENT_RENDERSYSTEM_H diff --git a/doomsday/apps/client/include/render/rendpoly.h b/doomsday/apps/client/include/render/rendpoly.h index 7827efbdde..8cee87607e 100644 --- a/doomsday/apps/client/include/render/rendpoly.h +++ b/doomsday/apps/client/include/render/rendpoly.h @@ -19,13 +19,13 @@ * 02110-1301 USA */ -#ifndef DENG_RENDER_RENDPOLY_H -#define DENG_RENDER_RENDPOLY_H +#ifndef DE_RENDER_RENDPOLY_H +#define DE_RENDER_RENDPOLY_H #include #include -DENG_EXTERN_C byte rendInfoRPolys; +DE_EXTERN_C byte rendInfoRPolys; void R_PrintRendPoolInfo(); @@ -79,4 +79,4 @@ void R_FreeRendColors(de::Vec4f *colorCoords); */ void R_FreeRendTexCoords(de::Vec2f *texCoords); -#endif // DENG_RENDER_RENDPOLY_H +#endif // DE_RENDER_RENDPOLY_H diff --git a/doomsday/apps/client/include/render/shadervar.h b/doomsday/apps/client/include/render/shadervar.h index 8f003c788d..ae1fc75bd4 100644 --- a/doomsday/apps/client/include/render/shadervar.h +++ b/doomsday/apps/client/include/render/shadervar.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_RENDER_SHADERVAR_H -#define DENG_CLIENT_RENDER_SHADERVAR_H +#ifndef DE_CLIENT_RENDER_SHADERVAR_H +#define DE_CLIENT_RENDER_SHADERVAR_H #include #include @@ -71,7 +71,7 @@ struct ShaderVars { QHash members; - DENG2_ERROR(DefinitionError); + DE_ERROR(DefinitionError); public: virtual ~ShaderVars(); @@ -83,4 +83,4 @@ struct ShaderVars void addBinding(de::Record &names, de::String const &varName, de::AnimationValue *anim); }; -#endif // DENG_CLIENT_RENDER_SHADERVAR_H +#endif // DE_CLIENT_RENDER_SHADERVAR_H diff --git a/doomsday/apps/client/include/render/shadowedge.h b/doomsday/apps/client/include/render/shadowedge.h index 9a2712820c..53eed85005 100644 --- a/doomsday/apps/client/include/render/shadowedge.h +++ b/doomsday/apps/client/include/render/shadowedge.h @@ -94,7 +94,7 @@ class ShadowEdge } private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace de diff --git a/doomsday/apps/client/include/render/skydrawable.h b/doomsday/apps/client/include/render/skydrawable.h index 291db9b94a..ae7981a3f9 100644 --- a/doomsday/apps/client/include/render/skydrawable.h +++ b/doomsday/apps/client/include/render/skydrawable.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_RENDER_SKYDRAWABLE_H -#define DENG_CLIENT_RENDER_SKYDRAWABLE_H +#ifndef DE_CLIENT_RENDER_SKYDRAWABLE_H +#define DE_CLIENT_RENDER_SKYDRAWABLE_H #include #include @@ -47,10 +47,10 @@ class SkyDrawable { public: /// Required layer state is missing. @ingroup errors - DENG2_ERROR(MissingLayerStateError); + DE_ERROR(MissingLayerStateError); /// Required model state is missing. @ingroup errors - DENG2_ERROR(MissingModelStateError); + DE_ERROR(MissingModelStateError); struct LayerState { @@ -107,7 +107,7 @@ class SkyDrawable void advanceTime(timespan_t elapsed); public: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; public: @@ -154,7 +154,7 @@ class SkyDrawable static void consoleRegister(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_RENDER_SKYDRAWABLE_H +#endif // DE_CLIENT_RENDER_SKYDRAWABLE_H diff --git a/doomsday/apps/client/include/render/skyfixedge.h b/doomsday/apps/client/include/render/skyfixedge.h index f5f80c17cb..e69a2fd61a 100644 --- a/doomsday/apps/client/include/render/skyfixedge.h +++ b/doomsday/apps/client/include/render/skyfixedge.h @@ -17,8 +17,8 @@ * 02110-1301 USA */ -#ifndef DENG_RENDER_SKY_FIX_EDGE -#define DENG_RENDER_SKY_FIX_EDGE +#ifndef DE_RENDER_SKY_FIX_EDGE +#define DE_RENDER_SKY_FIX_EDGE #include @@ -52,7 +52,7 @@ class SkyFixEdge : public WorldEdge Vec3d origin() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; public: @@ -82,9 +82,9 @@ class SkyFixEdge : public WorldEdge Event const &at(EventIndex index) const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace de -#endif // DENG_RENDER_SKY_FIX_EDGE +#endif // DE_RENDER_SKY_FIX_EDGE diff --git a/doomsday/apps/client/include/render/stateanimator.h b/doomsday/apps/client/include/render/stateanimator.h index e94240c64f..c87b76d188 100644 --- a/doomsday/apps/client/include/render/stateanimator.h +++ b/doomsday/apps/client/include/render/stateanimator.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_RENDER_STATEANIMATOR_H -#define DENG_CLIENT_RENDER_STATEANIMATOR_H +#ifndef DE_CLIENT_RENDER_STATEANIMATOR_H +#define DE_CLIENT_RENDER_STATEANIMATOR_H #include "render/modelrenderer.h" @@ -46,7 +46,7 @@ class StateAnimator : public de::ModelDrawable::Animator, public de::IObject { public: - DENG2_ERROR(DefinitionError); + DE_ERROR(DefinitionError); public: StateAnimator(); @@ -99,9 +99,9 @@ class StateAnimator : public de::ModelDrawable::Animator, void operator << (de::Reader &from) override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace render -#endif // DENG_CLIENT_RENDER_STATEANIMATOR_H +#endif // DE_CLIENT_RENDER_STATEANIMATOR_H diff --git a/doomsday/apps/client/include/render/store.h b/doomsday/apps/client/include/render/store.h index f89eacf8ea..d409169eac 100644 --- a/doomsday/apps/client/include/render/store.h +++ b/doomsday/apps/client/include/render/store.h @@ -16,8 +16,8 @@ * General Public License along with this program; if not, see: * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_RENDER_STORE_H -#define DENG_CLIENT_RENDER_STORE_H +#ifndef DE_CLIENT_RENDER_STORE_H +#define DE_CLIENT_RENDER_STORE_H #include @@ -46,4 +46,4 @@ struct Store de::duint _vertMax = 0; }; -#endif // DENG_CLIENT_RENDER_STORE_H +#endif // DE_CLIENT_RENDER_STORE_H diff --git a/doomsday/apps/client/include/render/trianglestripbuilder.h b/doomsday/apps/client/include/render/trianglestripbuilder.h index 6349412084..b71fe91115 100644 --- a/doomsday/apps/client/include/render/trianglestripbuilder.h +++ b/doomsday/apps/client/include/render/trianglestripbuilder.h @@ -17,8 +17,8 @@ * 02110-1301 USA */ -#ifndef DENG_RENDER_TRIANGLE_STRIP_BUILDER -#define DENG_RENDER_TRIANGLE_STRIP_BUILDER +#ifndef DE_RENDER_TRIANGLE_STRIP_BUILDER +#define DE_RENDER_TRIANGLE_STRIP_BUILDER #include /// @todo Remove me @@ -213,7 +213,7 @@ class TriangleStripBuilder int take(PositionBuffer **positions, TexCoordBuffer **texcoords = 0); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_RENDER_TRIANGLE_STRIP_BUILDER +#endif // DE_RENDER_TRIANGLE_STRIP_BUILDER diff --git a/doomsday/apps/client/include/render/vectorlightlist.h b/doomsday/apps/client/include/render/vectorlightlist.h index e4880bf40a..4cb97547ea 100644 --- a/doomsday/apps/client/include/render/vectorlightlist.h +++ b/doomsday/apps/client/include/render/vectorlightlist.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_RENDER_VECTORLIGHTLIST_H -#define DENG_CLIENT_RENDER_VECTORLIGHTLIST_H +#ifndef DE_CLIENT_RENDER_VECTORLIGHTLIST_H +#define DE_CLIENT_RENDER_VECTORLIGHTLIST_H #include "render/vectorlightdata.h" @@ -45,5 +45,5 @@ struct VectorLightList static Node *newNode(); }; -#endif // DENG_CLIENT_RENDER_VECTORLIGHTLIST_H +#endif // DE_CLIENT_RENDER_VECTORLIGHTLIST_H diff --git a/doomsday/apps/client/include/render/viewports.h b/doomsday/apps/client/include/render/viewports.h index 75e245dbb8..b97eb24fd5 100644 --- a/doomsday/apps/client/include/render/viewports.h +++ b/doomsday/apps/client/include/render/viewports.h @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_VIEWPORTS_H -#define DENG_CLIENT_VIEWPORTS_H +#ifndef DE_CLIENT_VIEWPORTS_H +#define DE_CLIENT_VIEWPORTS_H #ifdef __SERVER__ # error "viewports.h is for the client only" @@ -98,8 +98,8 @@ enum ViewPortLayer { HUDLayer }; -DENG_EXTERN_C int rendInfoTris; -DENG_EXTERN_C dd_bool firstFrameAfterLoad; +DE_EXTERN_C int rendInfoTris; +DE_EXTERN_C dd_bool firstFrameAfterLoad; /** * Register console variables. @@ -239,4 +239,4 @@ void R_ViewWindowTicker(int consoleNum, timespan_t ticLength); */ de::Mat4f const &Viewer_Matrix(); -#endif // DENG_CLIENT_VIEWPORTS_H +#endif // DE_CLIENT_VIEWPORTS_H diff --git a/doomsday/apps/client/include/render/vissprite.h b/doomsday/apps/client/include/render/vissprite.h index 8dc1a3326c..4f5c788d66 100644 --- a/doomsday/apps/client/include/render/vissprite.h +++ b/doomsday/apps/client/include/render/vissprite.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_RENDER_VISSPRITE_H -#define DENG_CLIENT_RENDER_VISSPRITE_H +#ifndef DE_CLIENT_RENDER_VISSPRITE_H +#define DE_CLIENT_RENDER_VISSPRITE_H #include #include @@ -203,9 +203,9 @@ struct vispsprite_t } data; }; -DENG_EXTERN_C vissprite_t visSprites[MAXVISSPRITES], *visSpriteP; -DENG_EXTERN_C vissprite_t visSprSortedHead; -DENG_EXTERN_C vispsprite_t visPSprites[DDMAXPSPRITES]; +DE_EXTERN_C vissprite_t visSprites[MAXVISSPRITES], *visSpriteP; +DE_EXTERN_C vissprite_t visSprSortedHead; +DE_EXTERN_C vispsprite_t visPSprites[DDMAXPSPRITES]; /// To be called at the start of the current render frame to clear the vissprite list. void R_ClearVisSprites(); @@ -214,4 +214,4 @@ vissprite_t *R_NewVisSprite(visspritetype_t type); void R_SortVisSprites(); -#endif // DENG_CLIENT_RENDER_VISSPRITE_H +#endif // DE_CLIENT_RENDER_VISSPRITE_H diff --git a/doomsday/apps/client/include/render/walledge.h b/doomsday/apps/client/include/render/walledge.h index 75ad9f0962..133a0035c3 100644 --- a/doomsday/apps/client/include/render/walledge.h +++ b/doomsday/apps/client/include/render/walledge.h @@ -46,12 +46,12 @@ namespace de { class HEdge; } */ class WallEdge : public WorldEdge { - DENG2_NO_COPY (WallEdge) - DENG2_NO_ASSIGN(WallEdge) + DE_NO_COPY (WallEdge) + DE_NO_ASSIGN(WallEdge) public: /// Invalid range geometry was found during prepare() @ingroup errors - DENG2_ERROR(InvalidError); + DE_ERROR(InvalidError); class Event : public WorldEdge::Event, public de::IHPlane::IIntercept { diff --git a/doomsday/apps/client/include/render/wallspec.h b/doomsday/apps/client/include/render/wallspec.h index 90fbe3dd14..71a60cc521 100644 --- a/doomsday/apps/client/include/render/wallspec.h +++ b/doomsday/apps/client/include/render/wallspec.h @@ -17,8 +17,8 @@ * 02110-1301 USA */ -#ifndef DENG_RENDER_WALLSPEC -#define DENG_RENDER_WALLSPEC +#ifndef DE_RENDER_WALLSPEC +#define DE_RENDER_WALLSPEC #include @@ -92,4 +92,4 @@ class WallSpec Q_DECLARE_OPERATORS_FOR_FLAGS(WallSpec::Flags) -#endif // DENG_RENDER_WALLSPEC +#endif // DE_RENDER_WALLSPEC diff --git a/doomsday/apps/client/include/resource/abstractfont.h b/doomsday/apps/client/include/resource/abstractfont.h index 5cd442af7f..a1fe6c7a71 100644 --- a/doomsday/apps/client/include/resource/abstractfont.h +++ b/doomsday/apps/client/include/resource/abstractfont.h @@ -47,7 +47,7 @@ class AbstractFont { public: /// Notified when the resource is about to be deleted. - DENG2_DEFINE_AUDIENCE(Deletion, void fontBeingDeleted(AbstractFont const &font)) + DE_DEFINE_AUDIENCE(Deletion, void fontBeingDeleted(AbstractFont const &font)) enum Flag { Colorize = 0x1, ///< Can be colored. @@ -66,7 +66,7 @@ class AbstractFont AbstractFont(de::FontManifest &manifest); virtual ~AbstractFont(); - DENG2_CAST_METHODS() + DE_CAST_METHODS() /** * Returns the resource manifest for the font. diff --git a/doomsday/apps/client/include/resource/bitmapfont.h b/doomsday/apps/client/include/resource/bitmapfont.h index 309da6d948..1b3c03403e 100644 --- a/doomsday/apps/client/include/resource/bitmapfont.h +++ b/doomsday/apps/client/include/resource/bitmapfont.h @@ -55,7 +55,7 @@ class BitmapFont : public AbstractFont void glDeinit() const override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // CLIENT_RESOURCE_BITMAPFONT_H diff --git a/doomsday/apps/client/include/resource/clientmaterial.h b/doomsday/apps/client/include/resource/clientmaterial.h index d6af71bc73..aef19f89d5 100644 --- a/doomsday/apps/client/include/resource/clientmaterial.h +++ b/doomsday/apps/client/include/resource/clientmaterial.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_RESOURCE_CLIENTMATERIAL_H -#define DENG_RESOURCE_CLIENTMATERIAL_H +#ifndef DE_RESOURCE_CLIENTMATERIAL_H +#define DE_RESOURCE_CLIENTMATERIAL_H #include #include "audio/s_environ.h" @@ -67,7 +67,7 @@ class ClientMaterial : public world::Material //- Decorations ------------------------------------------------------------------------- /// The referenced decoration does not exist. @ingroup errors - DENG2_ERROR(MissingDecorationError); + DE_ERROR(MissingDecorationError); /** * Base class for modelling a logical "decoration". @@ -89,7 +89,7 @@ class ClientMaterial : public world::Material { public: /// The referenced stage does not exist. @ingroup errors - DENG2_ERROR(MissingStageError); + DE_ERROR(MissingStageError); /** * Base class for a logical decoration animation stage. @@ -103,7 +103,7 @@ class ClientMaterial : public world::Material Stage(Stage const &other) : tics(other.tics), variance(other.variance) {} virtual ~Stage() {} - DENG2_CAST_METHODS() + DE_CAST_METHODS() /** * Returns a human-friendly, textual description of the animation stage @@ -120,7 +120,7 @@ class ClientMaterial : public world::Material de::Vec2i const &patternOffset = de::Vec2i()); virtual ~Decoration(); - DENG2_CAST_METHODS() + DE_CAST_METHODS() /** * Returns a human-friendly, textual name for the type of material decoration. @@ -184,7 +184,7 @@ class ClientMaterial : public world::Material Stages _stages; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; /** @@ -254,9 +254,9 @@ class ClientMaterial : public world::Material static ClientMaterial &find(de::Uri const &uri); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; typedef ClientMaterial::Decoration MaterialDecoration; -#endif // DENG_RESOURCE_CLIENTMATERIAL_H +#endif // DE_RESOURCE_CLIENTMATERIAL_H diff --git a/doomsday/apps/client/include/resource/clientresources.h b/doomsday/apps/client/include/resource/clientresources.h index cfd5429ae7..f37972ce74 100644 --- a/doomsday/apps/client/include/resource/clientresources.h +++ b/doomsday/apps/client/include/resource/clientresources.h @@ -18,8 +18,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_RESOURCES_H -#define DENG_CLIENT_RESOURCES_H +#ifndef DE_CLIENT_RESOURCES_H +#define DE_CLIENT_RESOURCES_H #include #include @@ -88,10 +88,10 @@ class ClientResources : public Resources { public: /// The referenced model def was not found. @ingroup errors - DENG2_ERROR(MissingModelDefError); + DE_ERROR(MissingModelDefError); /// The specified font id was invalid (out of range). @ingroup errors - DENG2_ERROR(UnknownFontIdError); + DE_ERROR(UnknownFontIdError); typedef QMap FontSchemes; typedef QList AllFonts; @@ -426,9 +426,9 @@ class ClientResources : public Resources static void consoleRegister(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -DENG_EXTERN_C byte precacheMapMaterials, precacheSprites; +DE_EXTERN_C byte precacheMapMaterials, precacheSprites; -#endif // DENG_CLIENT_RESOURCES_H +#endif // DE_CLIENT_RESOURCES_H diff --git a/doomsday/apps/client/include/resource/clienttexture.h b/doomsday/apps/client/include/resource/clienttexture.h index 4eeea32d84..881a41103e 100644 --- a/doomsday/apps/client/include/resource/clienttexture.h +++ b/doomsday/apps/client/include/resource/clienttexture.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_RESOURCE_CLIENTTEXTURE_H -#define DENG_RESOURCE_CLIENTTEXTURE_H +#ifndef DE_RESOURCE_CLIENTTEXTURE_H +#define DE_RESOURCE_CLIENTTEXTURE_H #include "resource/image.h" // res::Source #include "TextureVariantSpec" @@ -136,7 +136,7 @@ class ClientTexture : public res::Texture void glCoords(float *s, float *t) const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; /// A list of variants. @@ -210,11 +210,11 @@ class ClientTexture : public res::Texture uint variantCount() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; Q_DECLARE_OPERATORS_FOR_FLAGS(ClientTexture::Flags) typedef ClientTexture::Variant TextureVariant; -#endif // DENG_RESOURCE_CLIENTTEXTURE_H +#endif // DE_RESOURCE_CLIENTTEXTURE_H diff --git a/doomsday/apps/client/include/resource/compositebitmapfont.h b/doomsday/apps/client/include/resource/compositebitmapfont.h index 9e381d96dc..a60b873641 100644 --- a/doomsday/apps/client/include/resource/compositebitmapfont.h +++ b/doomsday/apps/client/include/resource/compositebitmapfont.h @@ -79,7 +79,7 @@ class CompositeBitmapFont : public AbstractFont uint glyphTextureBorder(uchar ch) const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // CLIENT_RESOURCE_COMPOSITEBITMAPFONT_H diff --git a/doomsday/apps/client/include/resource/fontmanifest.h b/doomsday/apps/client/include/resource/fontmanifest.h index 56f52105b9..c3101eb152 100644 --- a/doomsday/apps/client/include/resource/fontmanifest.h +++ b/doomsday/apps/client/include/resource/fontmanifest.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_RESOURCE_FONTMANIFEST_H -#define DENG_RESOURCE_FONTMANIFEST_H +#ifndef DE_RESOURCE_FONTMANIFEST_H +#define DE_RESOURCE_FONTMANIFEST_H #include "AbstractFont" #include @@ -45,13 +45,13 @@ class FontManifest : public PathTree::Node { public: /// Required Font instance is missing. @ingroup errors - DENG2_ERROR(MissingFontError); + DE_ERROR(MissingFontError); /// Notified when the manifest is about to be deleted. - DENG2_DEFINE_AUDIENCE(Deletion, void fontManifestBeingDeleted(FontManifest const &manifest)) + DE_DEFINE_AUDIENCE(Deletion, void fontManifestBeingDeleted(FontManifest const &manifest)) /// Notified whenever the unique identifier changes. - DENG2_DEFINE_AUDIENCE(UniqueIdChange, void fontManifestUniqueIdChanged(FontManifest &manifest)) + DE_DEFINE_AUDIENCE(UniqueIdChange, void fontManifestUniqueIdChanged(FontManifest &manifest)) public: FontManifest(PathTree::NodeArgs const &args); @@ -141,9 +141,9 @@ class FontManifest : public PathTree::Node inline void clearResource() { setResource(0); } private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace de -#endif // DENG_RESOURCE_FONTMANIFEST_H +#endif // DE_RESOURCE_FONTMANIFEST_H diff --git a/doomsday/apps/client/include/resource/fontscheme.h b/doomsday/apps/client/include/resource/fontscheme.h index dc3f65169f..1e7a3dc0cb 100644 --- a/doomsday/apps/client/include/resource/fontscheme.h +++ b/doomsday/apps/client/include/resource/fontscheme.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_RESOURCE_FONTSCHEME_H -#define DENG_RESOURCE_FONTSCHEME_H +#ifndef DE_RESOURCE_FONTSCHEME_H +#define DE_RESOURCE_FONTSCHEME_H #include "FontManifest" #include @@ -42,16 +42,16 @@ class FontScheme public: /// The requested manifests could not be found in the index. - DENG2_ERROR(NotFoundError); + DE_ERROR(NotFoundError); /// The specified path was not valid. @ingroup errors - DENG2_ERROR(InvalidPathError); + DE_ERROR(InvalidPathError); /// Notified whenever a new manifest is defined in the scheme. - DENG2_DEFINE_AUDIENCE(ManifestDefined, void fontSchemeManifestDefined(FontScheme &scheme, Manifest &manifest)) + DE_DEFINE_AUDIENCE(ManifestDefined, void fontSchemeManifestDefined(FontScheme &scheme, Manifest &manifest)) /// Minimum length of a symbolic name. - static int const min_name_length = DENG2_URI_MIN_SCHEME_LENGTH; + static int const min_name_length = DE_URI_MIN_SCHEME_LENGTH; /// Manifests in the scheme are placed into a tree. typedef PathTreeT Index; @@ -123,9 +123,9 @@ class FontScheme Index const &index() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace de -#endif // DENG_RESOURCE_FONTSCHEME_H +#endif // DE_RESOURCE_FONTSCHEME_H diff --git a/doomsday/apps/client/include/resource/framemodel.h b/doomsday/apps/client/include/resource/framemodel.h index c53f31ad36..7a4c8bcecf 100644 --- a/doomsday/apps/client/include/resource/framemodel.h +++ b/doomsday/apps/client/include/resource/framemodel.h @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_RESOURCE_FRAMEMODEL_H -#define DENG_RESOURCE_FRAMEMODEL_H +#ifndef DE_RESOURCE_FRAMEMODEL_H +#define DE_RESOURCE_FRAMEMODEL_H #include #ifdef __CLIENT__ @@ -46,13 +46,13 @@ class FrameModel { public: /// Referenced frame is missing. @ingroup errors - DENG2_ERROR(MissingFrameError); + DE_ERROR(MissingFrameError); /// Referenced skin is missing. @ingroup errors - DENG2_ERROR(MissingSkinError); + DE_ERROR(MissingSkinError); /// Referenced detail level is missing. @ingroup errors - DENG2_ERROR(MissingDetailLevelError); + DE_ERROR(MissingDetailLevelError); /** * Classification/processing flags. @@ -305,7 +305,7 @@ class FrameModel QBitArray const &lodVertexUsage() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; Q_DECLARE_OPERATORS_FOR_FLAGS(FrameModel::Flags) @@ -314,4 +314,4 @@ typedef FrameModel::DetailLevel FrameModelLOD; typedef FrameModel::Frame FrameModelFrame; typedef FrameModel::Skin FrameModelSkin; -#endif // DENG_RESOURCE_FRAMEMODEL_H +#endif // DE_RESOURCE_FRAMEMODEL_H diff --git a/doomsday/apps/client/include/resource/framemodeldef.h b/doomsday/apps/client/include/resource/framemodeldef.h index 6bf6e9691d..b9dcce682a 100644 --- a/doomsday/apps/client/include/resource/framemodeldef.h +++ b/doomsday/apps/client/include/resource/framemodeldef.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_RESOURCE_FRAMEMODELDEF_H -#define DENG_RESOURCE_FRAMEMODELDEF_H +#ifndef DE_RESOURCE_FRAMEMODELDEF_H +#define DE_RESOURCE_FRAMEMODELDEF_H #include #include @@ -186,13 +186,13 @@ struct FrameModelDef SubmodelDef &subModelDef(unsigned int subnum) { - DENG2_ASSERT(hasSub(subnum)); + DE_ASSERT(hasSub(subnum)); return _sub[subnum]; } SubmodelDef const &subModelDef(unsigned int subnum) const { - DENG2_ASSERT(hasSub(subnum)); + DE_ASSERT(hasSub(subnum)); return _sub[subnum]; } @@ -205,7 +205,7 @@ struct FrameModelDef { if(hasSub(subnum)) { - DENG2_ASSERT(subnum < _ptcOffset.size()); + DE_ASSERT(subnum < _ptcOffset.size()); return _ptcOffset[subnum]; } return de::Vec3f(); @@ -213,9 +213,9 @@ struct FrameModelDef void setParticleOffset(unsigned int subnum, de::Vec3f const &off) { - DENG2_ASSERT(hasSub(subnum)); + DE_ASSERT(hasSub(subnum)); _ptcOffset[subnum] = off; } }; -#endif // DENG_RESOURCE_FRAMEMODELDEF_H +#endif // DE_RESOURCE_FRAMEMODELDEF_H diff --git a/doomsday/apps/client/include/resource/hq2x.h b/doomsday/apps/client/include/resource/hq2x.h index 87414c43bc..297241e617 100644 --- a/doomsday/apps/client/include/resource/hq2x.h +++ b/doomsday/apps/client/include/resource/hq2x.h @@ -18,8 +18,8 @@ * http://www.gnu.org/licenses */ -#ifndef LIBDENG_RESOURCE_HQ2X_H -#define LIBDENG_RESOURCE_HQ2X_H +#ifndef DE_RESOURCE_HQ2X_H +#define DE_RESOURCE_HQ2X_H #ifdef __cplusplus extern "C" { @@ -57,4 +57,4 @@ uint8_t *GL_SmartFilterHQ2x(uint8_t const *src, int width, int height, int flags } // extern "C" #endif -#endif /* LIBDENG_RESOURCE_HQ2X_H */ +#endif /* DE_RESOURCE_HQ2X_H */ diff --git a/doomsday/apps/client/include/resource/image.h b/doomsday/apps/client/include/resource/image.h index 02bd160dfd..966fff58d8 100644 --- a/doomsday/apps/client/include/resource/image.h +++ b/doomsday/apps/client/include/resource/image.h @@ -20,8 +20,8 @@ * 02110-1301 USA */ -#ifndef DENG_RESOURCE_IMAGE_H -#define DENG_RESOURCE_IMAGE_H +#ifndef DE_RESOURCE_IMAGE_H +#define DE_RESOURCE_IMAGE_H #ifndef __CLIENT__ # error "resource/image.h is for the client only" @@ -148,4 +148,4 @@ res::Source GL_LoadExtImage(image_t &image, char const *searchPath, gfxmode_t mo res::Source GL_LoadSourceImage(image_t &image, ClientTexture const &tex, TextureVariantSpec const &spec); -#endif // DENG_RESOURCE_IMAGE_H +#endif // DE_RESOURCE_IMAGE_H diff --git a/doomsday/apps/client/include/resource/materialanimator.h b/doomsday/apps/client/include/resource/materialanimator.h index 474332463d..ecf8e49d36 100644 --- a/doomsday/apps/client/include/resource/materialanimator.h +++ b/doomsday/apps/client/include/resource/materialanimator.h @@ -48,13 +48,13 @@ class MaterialAnimator { public: /// The referenced (GL)texture unit does not exist. @ingroup errors - DENG2_ERROR(MissingTextureUnitError); + DE_ERROR(MissingTextureUnitError); /// The referenced decoration does not exist. @ingroup errors - DENG2_ERROR(MissingDecorationError); + DE_ERROR(MissingDecorationError); /// Notified whenever one or more decoration stage changes occur. - DENG2_DEFINE_AUDIENCE(DecorationStageChange, void materialAnimatorDecorationStageChanged(MaterialAnimator &animator)) + DE_DEFINE_AUDIENCE(DecorationStageChange, void materialAnimatorDecorationStageChanged(MaterialAnimator &animator)) /** * (GL)Texture unit identifier: @@ -107,7 +107,7 @@ class MaterialAnimator void reset(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; public: @@ -205,7 +205,7 @@ class MaterialAnimator Decoration &decoration(int decorIndex) const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // CLIENT_RESOURCE_MATERIALANIMATOR_H diff --git a/doomsday/apps/client/include/resource/rawtexture.h b/doomsday/apps/client/include/resource/rawtexture.h index 4ce4e19904..20bbdca8fd 100644 --- a/doomsday/apps/client/include/resource/rawtexture.h +++ b/doomsday/apps/client/include/resource/rawtexture.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_RESOURCE_RAWTEXTURE -#define DENG_RESOURCE_RAWTEXTURE +#ifndef DE_RESOURCE_RAWTEXTURE +#define DE_RESOURCE_RAWTEXTURE #include "dd_share.h" // For lumpnum_t #include @@ -45,4 +45,4 @@ struct rawtex_t {} }; -#endif // DENG_RESOURCE_RAWTEXTURE +#endif // DE_RESOURCE_RAWTEXTURE diff --git a/doomsday/apps/client/include/resource/texturevariantspec.h b/doomsday/apps/client/include/resource/texturevariantspec.h index 993e00eef7..785d89422c 100644 --- a/doomsday/apps/client/include/resource/texturevariantspec.h +++ b/doomsday/apps/client/include/resource/texturevariantspec.h @@ -17,8 +17,8 @@ * 02110-1301 USA */ -#ifndef DENG_RESOURCE_TEXTUREVARIANTSPEC_H -#define DENG_RESOURCE_TEXTUREVARIANTSPEC_H +#ifndef DE_RESOURCE_TEXTUREVARIANTSPEC_H +#define DE_RESOURCE_TEXTUREVARIANTSPEC_H #ifndef __CLIENT__ # error "resource/texturevariantspec.h only exists in the Client" @@ -180,4 +180,4 @@ class TextureVariantSpec de::String asText() const; }; -#endif // DENG_RESOURCE_TEXTUREVARIANTSPEC_H +#endif // DE_RESOURCE_TEXTUREVARIANTSPEC_H diff --git a/doomsday/apps/client/include/sdlnet_dummy.h b/doomsday/apps/client/include/sdlnet_dummy.h index baaf902f76..af7c11877d 100644 --- a/doomsday/apps/client/include/sdlnet_dummy.h +++ b/doomsday/apps/client/include/sdlnet_dummy.h @@ -1,5 +1,5 @@ -#ifndef DENG_SDLNET_DUMMY_H -#define DENG_SDLNET_DUMMY_H +#ifndef DE_SDLNET_DUMMY_H +#define DE_SDLNET_DUMMY_H typedef void* TCPsocket; typedef struct { diff --git a/doomsday/apps/client/include/sys_system.h b/doomsday/apps/client/include/sys_system.h index cc7506b4fa..6e092829c6 100644 --- a/doomsday/apps/client/include/sys_system.h +++ b/doomsday/apps/client/include/sys_system.h @@ -18,8 +18,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CORE_SYSTEM_H -#define DENG_CORE_SYSTEM_H +#ifndef DE_CORE_SYSTEM_H +#define DE_CORE_SYSTEM_H #include #include @@ -36,7 +36,7 @@ void Sys_Shutdown(); bool Sys_IsShuttingDown(); #undef Sys_Quit -DENG_EXTERN_C void Sys_Quit(); +DE_EXTERN_C void Sys_Quit(); void Sys_HideMouseCursor(); @@ -55,4 +55,4 @@ void Sys_BlockUntilRealTime(de::duint realTimeMs); de::dint Sys_CriticalMessage(char const *msg); de::dint Sys_CriticalMessagef(char const *format, ...) PRINTF_F(1,2); -#endif // DENG_CORE_SYSTEM_H +#endif // DE_CORE_SYSTEM_H diff --git a/doomsday/apps/client/include/ui/alertmask.h b/doomsday/apps/client/include/ui/alertmask.h index dcb3f2df01..2ff072428f 100644 --- a/doomsday/apps/client/include/ui/alertmask.h +++ b/doomsday/apps/client/include/ui/alertmask.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_ALERTMASK_H -#define DENG_CLIENT_ALERTMASK_H +#ifndef DE_CLIENT_ALERTMASK_H +#define DE_CLIENT_ALERTMASK_H #include @@ -35,7 +35,7 @@ class AlertMask bool shouldRaiseAlert(de::duint32 entryMetadata) const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_ALERTMASK_H +#endif // DE_CLIENT_ALERTMASK_H diff --git a/doomsday/apps/client/include/ui/axisinputcontrol.h b/doomsday/apps/client/include/ui/axisinputcontrol.h index bfd143e5c7..439499fc30 100644 --- a/doomsday/apps/client/include/ui/axisinputcontrol.h +++ b/doomsday/apps/client/include/ui/axisinputcontrol.h @@ -102,7 +102,7 @@ class AxisInputControl : public InputDevice::Control void consoleRegister(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // CLIENT_UI_AXISINPUTCONTROL_H diff --git a/doomsday/apps/client/include/ui/bindcontext.h b/doomsday/apps/client/include/ui/bindcontext.h index 2f0a4bd8d4..ab50ffd6df 100644 --- a/doomsday/apps/client/include/ui/bindcontext.h +++ b/doomsday/apps/client/include/ui/bindcontext.h @@ -49,13 +49,13 @@ class BindContext { public: /// Notified when the active state of the context changes. - DENG2_DEFINE_AUDIENCE2(ActiveChange, void bindContextActiveChanged(BindContext &context)) + DE_DEFINE_AUDIENCE2(ActiveChange, void bindContextActiveChanged(BindContext &context)) /// Notified when the list of devices to acquire changes. - DENG2_DEFINE_AUDIENCE2(AcquireDeviceChange, void bindContextAcquireDeviceChanged(BindContext &context)) + DE_DEFINE_AUDIENCE2(AcquireDeviceChange, void bindContextAcquireDeviceChanged(BindContext &context)) /// Notified whenever a new binding is made in this context. - DENG2_DEFINE_AUDIENCE2(BindingAddition, void bindContextBindingAdded(BindContext &context, de::Record &binding, bool isCommand)) + DE_DEFINE_AUDIENCE2(BindingAddition, void bindContextBindingAdded(BindContext &context, de::Record &binding, bool isCommand)) public: /** @@ -190,7 +190,7 @@ class BindContext void setDDFallbackResponder(DDFallbackResponderFunc newResponderFunc); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // CLIENT_INPUTSYSTEM_BINDCONTEXT_H diff --git a/doomsday/apps/client/include/ui/binding.h b/doomsday/apps/client/include/ui/binding.h index 16585cb830..e8166036c5 100644 --- a/doomsday/apps/client/include/ui/binding.h +++ b/doomsday/apps/client/include/ui/binding.h @@ -32,7 +32,7 @@ class Binding : public de::RecordAccessor { public: /// Base class for binding configuration errors. @ingroup errors - DENG2_ERROR(ConfigureError); + DE_ERROR(ConfigureError); enum ConditionType { diff --git a/doomsday/apps/client/include/ui/busyvisual.h b/doomsday/apps/client/include/ui/busyvisual.h index a9076c59d1..6cd78b8d98 100644 --- a/doomsday/apps/client/include/ui/busyvisual.h +++ b/doomsday/apps/client/include/ui/busyvisual.h @@ -20,8 +20,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_RENDER_BUSYVISUAL_H -#define LIBDENG_RENDER_BUSYVISUAL_H +#ifndef DE_RENDER_BUSYVISUAL_H +#define DE_RENDER_BUSYVISUAL_H #include "api_busy.h" @@ -65,4 +65,4 @@ void Con_DrawTransition(void); } // extern "C" #endif -#endif /* LIBDENG_RENDER_BUSYVISUAL_H */ +#endif /* DE_RENDER_BUSYVISUAL_H */ diff --git a/doomsday/apps/client/include/ui/clientrootwidget.h b/doomsday/apps/client/include/ui/clientrootwidget.h index 75b4ebab8e..605b4b2665 100644 --- a/doomsday/apps/client/include/ui/clientrootwidget.h +++ b/doomsday/apps/client/include/ui/clientrootwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENTROOTWIDGET_H -#define DENG_CLIENTROOTWIDGET_H +#ifndef DE_CLIENTROOTWIDGET_H +#define DE_CLIENTROOTWIDGET_H #include #include @@ -42,7 +42,7 @@ class ClientRootWidget : public de::GuiRootWidget void handleEventAsFallback(de::Event const &event) override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENTROOTWIDGET_H +#endif // DE_CLIENTROOTWIDGET_H diff --git a/doomsday/apps/client/include/ui/clientstyle.h b/doomsday/apps/client/include/ui/clientstyle.h index 30144d594d..5050c366c8 100644 --- a/doomsday/apps/client/include/ui/clientstyle.h +++ b/doomsday/apps/client/include/ui/clientstyle.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_CLIENTSTYLE_H -#define DENG_CLIENT_UI_CLIENTSTYLE_H +#ifndef DE_CLIENT_UI_CLIENTSTYLE_H +#define DE_CLIENT_UI_CLIENTSTYLE_H #include #include @@ -62,9 +62,9 @@ class ClientStyle : public de::Style LogoFlags flags = DefaultLogoFlags); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; Q_DECLARE_OPERATORS_FOR_FLAGS(ClientStyle::LogoFlags) -#endif // DENG_CLIENT_UI_CLIENTSTYLE_H +#endif // DE_CLIENT_UI_CLIENTSTYLE_H diff --git a/doomsday/apps/client/include/ui/clientwindow.h b/doomsday/apps/client/include/ui/clientwindow.h index f12971dcfe..141b1412d6 100644 --- a/doomsday/apps/client/include/ui/clientwindow.h +++ b/doomsday/apps/client/include/ui/clientwindow.h @@ -32,10 +32,10 @@ #undef main -#define DENG_GAMEVIEW_X ClientWindow::main().game().rule().left().valuei() -#define DENG_GAMEVIEW_Y ClientWindow::main().game().rule().top().valuei() -#define DENG_GAMEVIEW_WIDTH ClientWindow::main().game().rule().width().valuei() -#define DENG_GAMEVIEW_HEIGHT ClientWindow::main().game().rule().height().valuei() +#define DE_GAMEVIEW_X ClientWindow::main().game().rule().left().valuei() +#define DE_GAMEVIEW_Y ClientWindow::main().game().rule().top().valuei() +#define DE_GAMEVIEW_WIDTH ClientWindow::main().game().rule().width().valuei() +#define DE_GAMEVIEW_HEIGHT ClientWindow::main().game().rule().height().valuei() /** * A helpful macro that changes the origin of the window space coordinate system. @@ -174,7 +174,7 @@ public slots: void windowAboutToClose() override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // CANVASWINDOW_H diff --git a/doomsday/apps/client/include/ui/clientwindowsystem.h b/doomsday/apps/client/include/ui/clientwindowsystem.h index 4bdbcbc9eb..b8779964ca 100644 --- a/doomsday/apps/client/include/ui/clientwindowsystem.h +++ b/doomsday/apps/client/include/ui/clientwindowsystem.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENTWINDOWSYSTEM_H -#define DENG_CLIENTWINDOWSYSTEM_H +#ifndef DE_CLIENTWINDOWSYSTEM_H +#define DE_CLIENTWINDOWSYSTEM_H #include #include @@ -60,7 +60,7 @@ class ClientWindowSystem : public de::WindowSystem void rootUpdate(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENTWINDOWSYSTEM_H +#endif // DE_CLIENTWINDOWSYSTEM_H diff --git a/doomsday/apps/client/include/ui/controllerpresets.h b/doomsday/apps/client/include/ui/controllerpresets.h index e8da744acd..29b7211074 100644 --- a/doomsday/apps/client/include/ui/controllerpresets.h +++ b/doomsday/apps/client/include/ui/controllerpresets.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_CONTROLLERPRESETS_H -#define DENG_CLIENT_UI_CONTROLLERPRESETS_H +#ifndef DE_CLIENT_UI_CONTROLLERPRESETS_H +#define DE_CLIENT_UI_CONTROLLERPRESETS_H #include #include @@ -37,8 +37,8 @@ class ControllerPresets void applyPreset(de::String const &presetId); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_CONTROLLERPRESETS_H +#endif // DE_CLIENT_UI_CONTROLLERPRESETS_H diff --git a/doomsday/apps/client/include/ui/dialogs/aboutdialog.h b/doomsday/apps/client/include/ui/dialogs/aboutdialog.h index ca4f353afd..430fe0d4ab 100644 --- a/doomsday/apps/client/include/ui/dialogs/aboutdialog.h +++ b/doomsday/apps/client/include/ui/dialogs/aboutdialog.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_ABOUTDIALOG_H -#define DENG_CLIENT_ABOUTDIALOG_H +#ifndef DE_CLIENT_ABOUTDIALOG_H +#define DE_CLIENT_ABOUTDIALOG_H #include @@ -32,7 +32,7 @@ class AboutDialog : public de::DialogWidget AboutDialog(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_ABOUTDIALOG_H +#endif // DE_CLIENT_ABOUTDIALOG_H diff --git a/doomsday/apps/client/include/ui/dialogs/alertdialog.h b/doomsday/apps/client/include/ui/dialogs/alertdialog.h index 582651bf91..72fbc6cc43 100644 --- a/doomsday/apps/client/include/ui/dialogs/alertdialog.h +++ b/doomsday/apps/client/include/ui/dialogs/alertdialog.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_ALERTDIALOG_H -#define DENG_CLIENT_ALERTDIALOG_H +#ifndef DE_CLIENT_ALERTDIALOG_H +#define DE_CLIENT_ALERTDIALOG_H #include @@ -72,7 +72,7 @@ public slots: void panelDismissed(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_ALERTDIALOG_H +#endif // DE_CLIENT_ALERTDIALOG_H diff --git a/doomsday/apps/client/include/ui/dialogs/audiosettingsdialog.h b/doomsday/apps/client/include/ui/dialogs/audiosettingsdialog.h index faedc49967..15ccb7faec 100644 --- a/doomsday/apps/client/include/ui/dialogs/audiosettingsdialog.h +++ b/doomsday/apps/client/include/ui/dialogs/audiosettingsdialog.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_AUDIOSETTINGSDIALOG_H -#define DENG_CLIENT_AUDIOSETTINGSDIALOG_H +#ifndef DE_CLIENT_AUDIOSETTINGSDIALOG_H +#define DE_CLIENT_AUDIOSETTINGSDIALOG_H #include @@ -38,7 +38,7 @@ public slots: void finish(int result) override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_AUDIOSETTINGSDIALOG_H +#endif // DE_CLIENT_AUDIOSETTINGSDIALOG_H diff --git a/doomsday/apps/client/include/ui/dialogs/coloradjustmentdialog.h b/doomsday/apps/client/include/ui/dialogs/coloradjustmentdialog.h index 45b3c1c6d3..2b0980be7a 100644 --- a/doomsday/apps/client/include/ui/dialogs/coloradjustmentdialog.h +++ b/doomsday/apps/client/include/ui/dialogs/coloradjustmentdialog.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_COLORADJUSTMENTDIALOG_H -#define DENG_CLIENT_COLORADJUSTMENTDIALOG_H +#ifndef DE_CLIENT_COLORADJUSTMENTDIALOG_H +#define DE_CLIENT_COLORADJUSTMENTDIALOG_H #include @@ -38,7 +38,7 @@ public slots: void resetToDefaults(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_COLORADJUSTMENTDIALOG_H +#endif // DE_CLIENT_COLORADJUSTMENTDIALOG_H diff --git a/doomsday/apps/client/include/ui/dialogs/createprofiledialog.h b/doomsday/apps/client/include/ui/dialogs/createprofiledialog.h index 47b9bcec73..5992506e59 100644 --- a/doomsday/apps/client/include/ui/dialogs/createprofiledialog.h +++ b/doomsday/apps/client/include/ui/dialogs/createprofiledialog.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_CREATEPROFILEDIALOG_H -#define DENG_CLIENT_UI_CREATEPROFILEDIALOG_H +#ifndef DE_CLIENT_UI_CREATEPROFILEDIALOG_H +#define DE_CLIENT_UI_CREATEPROFILEDIALOG_H #include #include @@ -54,7 +54,7 @@ class CreateProfileDialog GameProfile &profile); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_CREATEPROFILEDIALOG_H +#endif // DE_CLIENT_UI_CREATEPROFILEDIALOG_H diff --git a/doomsday/apps/client/include/ui/dialogs/datafilesettingsdialog.h b/doomsday/apps/client/include/ui/dialogs/datafilesettingsdialog.h index f8b82d857d..517dd042e6 100644 --- a/doomsday/apps/client/include/ui/dialogs/datafilesettingsdialog.h +++ b/doomsday/apps/client/include/ui/dialogs/datafilesettingsdialog.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_DATAFILESETTINGSDIALOG_H -#define DENG_CLIENT_DATAFILESETTINGSDIALOG_H +#ifndef DE_CLIENT_DATAFILESETTINGSDIALOG_H +#define DE_CLIENT_DATAFILESETTINGSDIALOG_H #include @@ -33,7 +33,7 @@ class DataFileSettingsDialog : public de::DirectoryListDialog void finish(int result) override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_DATAFILESETTINGSDIALOG_H +#endif // DE_CLIENT_DATAFILESETTINGSDIALOG_H diff --git a/doomsday/apps/client/include/ui/dialogs/downloaddialog.h b/doomsday/apps/client/include/ui/dialogs/downloaddialog.h index fc079a6a78..9ac2946847 100644 --- a/doomsday/apps/client/include/ui/dialogs/downloaddialog.h +++ b/doomsday/apps/client/include/ui/dialogs/downloaddialog.h @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_DOWNLOADDIALOG_H -#define DENG_CLIENT_DOWNLOADDIALOG_H +#ifndef DE_CLIENT_DOWNLOADDIALOG_H +#define DE_CLIENT_DOWNLOADDIALOG_H #include #include @@ -43,7 +43,7 @@ class DownloadDialog : public de::DialogWidget void updateStyle() override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_DOWNLOADDIALOG_H +#endif // DE_CLIENT_DOWNLOADDIALOG_H diff --git a/doomsday/apps/client/include/ui/dialogs/filedownloaddialog.h b/doomsday/apps/client/include/ui/dialogs/filedownloaddialog.h index a4d41a3621..4fa522ce79 100644 --- a/doomsday/apps/client/include/ui/dialogs/filedownloaddialog.h +++ b/doomsday/apps/client/include/ui/dialogs/filedownloaddialog.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_FILEDOWNLOADDIALOG_H -#define DENG_CLIENT_FILEDOWNLOADDIALOG_H +#ifndef DE_CLIENT_FILEDOWNLOADDIALOG_H +#define DE_CLIENT_FILEDOWNLOADDIALOG_H #include "downloaddialog.h" #include @@ -37,7 +37,7 @@ class FileDownloadDialog : public DownloadDialog void finish(int result) override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_FILEDOWNLOADDIALOG_H +#endif // DE_CLIENT_FILEDOWNLOADDIALOG_H diff --git a/doomsday/apps/client/include/ui/dialogs/inputsettingsdialog.h b/doomsday/apps/client/include/ui/dialogs/inputsettingsdialog.h index f55b902d8f..c20dbfd692 100644 --- a/doomsday/apps/client/include/ui/dialogs/inputsettingsdialog.h +++ b/doomsday/apps/client/include/ui/dialogs/inputsettingsdialog.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_INPUTSETTINGSDIALOG_H -#define DENG_CLIENT_INPUTSETTINGSDIALOG_H +#ifndef DE_CLIENT_INPUTSETTINGSDIALOG_H +#define DE_CLIENT_INPUTSETTINGSDIALOG_H #include @@ -40,7 +40,7 @@ protected slots: void applyControllerPreset(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_INPUTSETTINGSDIALOG_H +#endif // DE_CLIENT_INPUTSETTINGSDIALOG_H diff --git a/doomsday/apps/client/include/ui/dialogs/logsettingsdialog.h b/doomsday/apps/client/include/ui/dialogs/logsettingsdialog.h index ad32f0e5a3..7fb9554dd9 100644 --- a/doomsday/apps/client/include/ui/dialogs/logsettingsdialog.h +++ b/doomsday/apps/client/include/ui/dialogs/logsettingsdialog.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_LOGSETTINGSDIALOG_H -#define DENG_CLIENT_LOGSETTINGSDIALOG_H +#ifndef DE_CLIENT_LOGSETTINGSDIALOG_H +#define DE_CLIENT_LOGSETTINGSDIALOG_H #include @@ -36,7 +36,7 @@ public slots: void updateLogFilter(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_LOGSETTINGSDIALOG_H +#endif // DE_CLIENT_LOGSETTINGSDIALOG_H diff --git a/doomsday/apps/client/include/ui/dialogs/manualconnectiondialog.h b/doomsday/apps/client/include/ui/dialogs/manualconnectiondialog.h index bf27dddc72..f57ef8641a 100644 --- a/doomsday/apps/client/include/ui/dialogs/manualconnectiondialog.h +++ b/doomsday/apps/client/include/ui/dialogs/manualconnectiondialog.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_MANUALCONNECTIONDIALOG_H -#define DENG_CLIENT_MANUALCONNECTIONDIALOG_H +#ifndef DE_CLIENT_MANUALCONNECTIONDIALOG_H +#define DE_CLIENT_MANUALCONNECTIONDIALOG_H #include #include @@ -60,7 +60,7 @@ public slots: void finish(int result); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_MANUALCONNECTIONDIALOG_H +#endif // DE_CLIENT_MANUALCONNECTIONDIALOG_H diff --git a/doomsday/apps/client/include/ui/dialogs/networksettingsdialog.h b/doomsday/apps/client/include/ui/dialogs/networksettingsdialog.h index 571af9c18a..c115120c13 100644 --- a/doomsday/apps/client/include/ui/dialogs/networksettingsdialog.h +++ b/doomsday/apps/client/include/ui/dialogs/networksettingsdialog.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_NETWORKSETTINGSDIALOG_H -#define DENG_CLIENT_NETWORKSETTINGSDIALOG_H +#ifndef DE_CLIENT_NETWORKSETTINGSDIALOG_H +#define DE_CLIENT_NETWORKSETTINGSDIALOG_H #include @@ -35,7 +35,7 @@ public slots: void resetToDefaults(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_NETWORKSETTINGSDIALOG_H +#endif // DE_CLIENT_NETWORKSETTINGSDIALOG_H diff --git a/doomsday/apps/client/include/ui/dialogs/packagecompatibilitydialog.h b/doomsday/apps/client/include/ui/dialogs/packagecompatibilitydialog.h index 4c1df2b3fe..1f63a68f9c 100644 --- a/doomsday/apps/client/include/ui/dialogs/packagecompatibilitydialog.h +++ b/doomsday/apps/client/include/ui/dialogs/packagecompatibilitydialog.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_PACKAGECOMPATIBILITYDIALOG_H -#define DENG_CLIENT_UI_PACKAGECOMPATIBILITYDIALOG_H +#ifndef DE_CLIENT_UI_PACKAGECOMPATIBILITYDIALOG_H +#define DE_CLIENT_UI_PACKAGECOMPATIBILITYDIALOG_H #include @@ -38,7 +38,7 @@ class PackageCompatibilityDialog : public de::MessageDialog bool handleEvent(de::Event const &event) override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_PACKAGECOMPATIBILITYDIALOG_H +#endif // DE_CLIENT_UI_PACKAGECOMPATIBILITYDIALOG_H diff --git a/doomsday/apps/client/include/ui/dialogs/packageinfodialog.h b/doomsday/apps/client/include/ui/dialogs/packageinfodialog.h index 9e61d8f201..4981230bfd 100644 --- a/doomsday/apps/client/include/ui/dialogs/packageinfodialog.h +++ b/doomsday/apps/client/include/ui/dialogs/packageinfodialog.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_PACKAGEINFODIALOG_H -#define DENG_CLIENT_UI_PACKAGEINFODIALOG_H +#ifndef DE_CLIENT_UI_PACKAGEINFODIALOG_H +#define DE_CLIENT_UI_PACKAGEINFODIALOG_H #include @@ -45,7 +45,7 @@ public slots: void showFile(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_PACKAGEINFODIALOG_H +#endif // DE_CLIENT_UI_PACKAGEINFODIALOG_H diff --git a/doomsday/apps/client/include/ui/dialogs/packagesdialog.h b/doomsday/apps/client/include/ui/dialogs/packagesdialog.h index 3f5c5359b2..72cdc556f1 100644 --- a/doomsday/apps/client/include/ui/dialogs/packagesdialog.h +++ b/doomsday/apps/client/include/ui/dialogs/packagesdialog.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_PACKAGESDIALOG_H -#define DENG_CLIENT_PACKAGESDIALOG_H +#ifndef DE_CLIENT_PACKAGESDIALOG_H +#define DE_CLIENT_PACKAGESDIALOG_H #include #include @@ -41,8 +41,8 @@ class PackagesDialog : public de::DialogWidget void preparePanelForOpening() override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_PACKAGESDIALOG_H +#endif // DE_CLIENT_PACKAGESDIALOG_H diff --git a/doomsday/apps/client/include/ui/dialogs/renderersettingsdialog.h b/doomsday/apps/client/include/ui/dialogs/renderersettingsdialog.h index ffedca9715..42c71ff5f1 100644 --- a/doomsday/apps/client/include/ui/dialogs/renderersettingsdialog.h +++ b/doomsday/apps/client/include/ui/dialogs/renderersettingsdialog.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_RENDERERSETTINGSDIALOG_H -#define DENG_CLIENT_RENDERERSETTINGSDIALOG_H +#ifndef DE_CLIENT_RENDERERSETTINGSDIALOG_H +#define DE_CLIENT_RENDERERSETTINGSDIALOG_H #include @@ -42,7 +42,7 @@ protected slots: void finish(int result) override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_RENDERERSETTINGSDIALOG_H +#endif // DE_CLIENT_RENDERERSETTINGSDIALOG_H diff --git a/doomsday/apps/client/include/ui/dialogs/repositorybrowserdialog.h b/doomsday/apps/client/include/ui/dialogs/repositorybrowserdialog.h index 8b84771a8c..b14fe278be 100644 --- a/doomsday/apps/client/include/ui/dialogs/repositorybrowserdialog.h +++ b/doomsday/apps/client/include/ui/dialogs/repositorybrowserdialog.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_REPOSITORYBROWSERDIALOG_H -#define DENG_CLIENT_REPOSITORYBROWSERDIALOG_H +#ifndef DE_CLIENT_REPOSITORYBROWSERDIALOG_H +#define DE_CLIENT_REPOSITORYBROWSERDIALOG_H #include @@ -34,7 +34,7 @@ class RepositoryBrowserDialog : public de::DialogWidget void finish(int result) override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_REPOSITORYBROWSERDIALOG_H +#endif // DE_CLIENT_REPOSITORYBROWSERDIALOG_H diff --git a/doomsday/apps/client/include/ui/dialogs/serverinfodialog.h b/doomsday/apps/client/include/ui/dialogs/serverinfodialog.h index 2db8ec660a..741ac16cf8 100644 --- a/doomsday/apps/client/include/ui/dialogs/serverinfodialog.h +++ b/doomsday/apps/client/include/ui/dialogs/serverinfodialog.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_SERVERINFODIALOG_H -#define DENG_CLIENT_UI_SERVERINFODIALOG_H +#ifndef DE_CLIENT_UI_SERVERINFODIALOG_H +#define DE_CLIENT_UI_SERVERINFODIALOG_H #include #include @@ -36,7 +36,7 @@ class ServerInfoDialog : public de::DialogWidget void joinGame(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_SERVERINFODIALOG_H +#endif // DE_CLIENT_UI_SERVERINFODIALOG_H diff --git a/doomsday/apps/client/include/ui/dialogs/uisettingsdialog.h b/doomsday/apps/client/include/ui/dialogs/uisettingsdialog.h index 45e2bda9d9..e30f5e740b 100644 --- a/doomsday/apps/client/include/ui/dialogs/uisettingsdialog.h +++ b/doomsday/apps/client/include/ui/dialogs/uisettingsdialog.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UISETTINGSDIALOG_H -#define DENG_CLIENT_UISETTINGSDIALOG_H +#ifndef DE_CLIENT_UISETTINGSDIALOG_H +#define DE_CLIENT_UISETTINGSDIALOG_H #include @@ -30,7 +30,7 @@ class UISettingsDialog : public de::DialogWidget UISettingsDialog(de::String const &name = "uisettings"); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UISETTINGSDIALOG_H +#endif // DE_CLIENT_UISETTINGSDIALOG_H diff --git a/doomsday/apps/client/include/ui/dialogs/videosettingsdialog.h b/doomsday/apps/client/include/ui/dialogs/videosettingsdialog.h index 59408cc22b..281b85453d 100644 --- a/doomsday/apps/client/include/ui/dialogs/videosettingsdialog.h +++ b/doomsday/apps/client/include/ui/dialogs/videosettingsdialog.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_VIDEOSETTINGSDIALOG_H -#define DENG_CLIENT_VIDEOSETTINGSDIALOG_H +#ifndef DE_CLIENT_VIDEOSETTINGSDIALOG_H +#define DE_CLIENT_VIDEOSETTINGSDIALOG_H #include @@ -33,7 +33,7 @@ class VideoSettingsDialog : public de::DialogWidget protected slots: void resetToDefaults(); -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) void changeMode(uint selected); void changeColorDepth(uint selected); void changeRefreshRate(uint selected); @@ -43,7 +43,7 @@ protected slots: #endif private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_VIDEOSETTINGSDIALOG_H +#endif // DE_CLIENT_VIDEOSETTINGSDIALOG_H diff --git a/doomsday/apps/client/include/ui/dialogs/vrsettingsdialog.h b/doomsday/apps/client/include/ui/dialogs/vrsettingsdialog.h index 44068fbe4c..c303a75e57 100644 --- a/doomsday/apps/client/include/ui/dialogs/vrsettingsdialog.h +++ b/doomsday/apps/client/include/ui/dialogs/vrsettingsdialog.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_VRSETTINGSDIALOG_H -#define DENG_CLIENT_VRSETTINGSDIALOG_H +#ifndef DE_CLIENT_VRSETTINGSDIALOG_H +#define DE_CLIENT_VRSETTINGSDIALOG_H #include @@ -37,7 +37,7 @@ public slots: void autoConfigForDesktop(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_VRSETTINGSDIALOG_H +#endif // DE_CLIENT_VRSETTINGSDIALOG_H diff --git a/doomsday/apps/client/include/ui/editors/modelasseteditor.h b/doomsday/apps/client/include/ui/editors/modelasseteditor.h index 487a135a69..b9bc6ac223 100644 --- a/doomsday/apps/client/include/ui/editors/modelasseteditor.h +++ b/doomsday/apps/client/include/ui/editors/modelasseteditor.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_EDITOR_MODELASSETEDITOR_H -#define DENG_CLIENT_UI_EDITOR_MODELASSETEDITOR_H +#ifndef DE_CLIENT_UI_EDITOR_MODELASSETEDITOR_H +#define DE_CLIENT_UI_EDITOR_MODELASSETEDITOR_H #include "ui/widgets/sidebarwidget.h" @@ -38,7 +38,7 @@ protected slots: void updateOffsetVector(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_EDITOR_MODELASSETEDITOR_H +#endif // DE_CLIENT_UI_EDITOR_MODELASSETEDITOR_H diff --git a/doomsday/apps/client/include/ui/editors/rendererappearanceeditor.h b/doomsday/apps/client/include/ui/editors/rendererappearanceeditor.h index 8c76576fae..6bd437ac79 100644 --- a/doomsday/apps/client/include/ui/editors/rendererappearanceeditor.h +++ b/doomsday/apps/client/include/ui/editors/rendererappearanceeditor.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_RENDERERAPPEARANCEEDITOR_H -#define DENG_CLIENT_RENDERERAPPEARANCEEDITOR_H +#ifndef DE_CLIENT_RENDERERAPPEARANCEEDITOR_H +#define DE_CLIENT_RENDERERAPPEARANCEEDITOR_H #include #include "ui/widgets/sidebarwidget.h" @@ -41,7 +41,7 @@ class RendererAppearanceEditor : public SidebarWidget void operator << (de::PersistentState const &fromState); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_RENDERERAPPEARANCEEDITOR_H +#endif // DE_CLIENT_RENDERERAPPEARANCEEDITOR_H diff --git a/doomsday/apps/client/include/ui/editors/variablegroupeditor.h b/doomsday/apps/client/include/ui/editors/variablegroupeditor.h index ba4e3847d0..28c3cf83d9 100644 --- a/doomsday/apps/client/include/ui/editors/variablegroupeditor.h +++ b/doomsday/apps/client/include/ui/editors/variablegroupeditor.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_EDITORS_VARIABLEGROUPEDITOR_H -#define DENG_CLIENT_UI_EDITORS_VARIABLEGROUPEDITOR_H +#ifndef DE_CLIENT_UI_EDITORS_VARIABLEGROUPEDITOR_H +#define DE_CLIENT_UI_EDITORS_VARIABLEGROUPEDITOR_H #include #include @@ -109,7 +109,7 @@ public slots: virtual void unfoldAll(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_EDITORS_VARIABLEGROUPEDITOR_H +#endif // DE_CLIENT_UI_EDITORS_VARIABLEGROUPEDITOR_H diff --git a/doomsday/apps/client/include/ui/home/columnwidget.h b/doomsday/apps/client/include/ui/home/columnwidget.h index 5acac33010..df6b5d7594 100644 --- a/doomsday/apps/client/include/ui/home/columnwidget.h +++ b/doomsday/apps/client/include/ui/home/columnwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_COLUMNWIDGET_H -#define DENG_CLIENT_UI_COLUMNWIDGET_H +#ifndef DE_CLIENT_UI_COLUMNWIDGET_H +#define DE_CLIENT_UI_COLUMNWIDGET_H #include "headerwidget.h" #include @@ -62,7 +62,7 @@ class ColumnWidget : public de::GuiWidget void updateStyle() override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_COLUMNWIDGET_H +#endif // DE_CLIENT_UI_COLUMNWIDGET_H diff --git a/doomsday/apps/client/include/ui/home/gamecolumnwidget.h b/doomsday/apps/client/include/ui/home/gamecolumnwidget.h index f13d33c20b..4e723d8934 100644 --- a/doomsday/apps/client/include/ui/home/gamecolumnwidget.h +++ b/doomsday/apps/client/include/ui/home/gamecolumnwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_HOME_GAMECOLUMNWIDGET_H -#define DENG_CLIENT_UI_HOME_GAMECOLUMNWIDGET_H +#ifndef DE_CLIENT_UI_HOME_GAMECOLUMNWIDGET_H +#define DE_CLIENT_UI_HOME_GAMECOLUMNWIDGET_H #include "columnwidget.h" @@ -50,7 +50,7 @@ class GameColumnWidget : public ColumnWidget, public de::IPersistent static const de::String SORT_TITLE; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_HOME_GAMECOLUMNWIDGET_H +#endif // DE_CLIENT_UI_HOME_GAMECOLUMNWIDGET_H diff --git a/doomsday/apps/client/include/ui/home/gamepanelbuttonwidget.h b/doomsday/apps/client/include/ui/home/gamepanelbuttonwidget.h index 90240de7c8..86981adcd0 100644 --- a/doomsday/apps/client/include/ui/home/gamepanelbuttonwidget.h +++ b/doomsday/apps/client/include/ui/home/gamepanelbuttonwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_HOME_GAMEPANELBUTTONWIDGET_H -#define DENG_CLIENT_UI_HOME_GAMEPANELBUTTONWIDGET_H +#ifndef DE_CLIENT_UI_HOME_GAMEPANELBUTTONWIDGET_H +#define DE_CLIENT_UI_HOME_GAMEPANELBUTTONWIDGET_H #include "../widgets/panelbuttonwidget.h" @@ -56,7 +56,7 @@ protected slots: void saveDoubleClicked(de::ui::DataPos savePos); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_HOME_GAMEPANELBUTTONWIDGET_H +#endif // DE_CLIENT_UI_HOME_GAMEPANELBUTTONWIDGET_H diff --git a/doomsday/apps/client/include/ui/home/headerwidget.h b/doomsday/apps/client/include/ui/home/headerwidget.h index 1a84ecbca9..fc0775b2c3 100644 --- a/doomsday/apps/client/include/ui/home/headerwidget.h +++ b/doomsday/apps/client/include/ui/home/headerwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_HEADERWIDGET_H -#define DENG_CLIENT_UI_HEADERWIDGET_H +#ifndef DE_CLIENT_UI_HEADERWIDGET_H +#define DE_CLIENT_UI_HEADERWIDGET_H #include #include @@ -40,7 +40,7 @@ class HeaderWidget : public de::GuiWidget void setLogoBackground(de::DotPath const &imageId); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_HEADERWIDGET_H +#endif // DE_CLIENT_UI_HEADERWIDGET_H diff --git a/doomsday/apps/client/include/ui/home/homewidget.h b/doomsday/apps/client/include/ui/home/homewidget.h index e63f8af630..f7c604744b 100644 --- a/doomsday/apps/client/include/ui/home/homewidget.h +++ b/doomsday/apps/client/include/ui/home/homewidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_HOMEWIDGET_H -#define DENG_CLIENT_UI_HOMEWIDGET_H +#ifndef DE_CLIENT_UI_HOMEWIDGET_H +#define DE_CLIENT_UI_HOMEWIDGET_H #include #include @@ -60,7 +60,7 @@ public slots: void updateStyle() override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_HOMEWIDGET_H +#endif // DE_CLIENT_UI_HOMEWIDGET_H diff --git a/doomsday/apps/client/include/ui/home/multiplayercolumnwidget.h b/doomsday/apps/client/include/ui/home/multiplayercolumnwidget.h index 4685b130aa..4db95e5662 100644 --- a/doomsday/apps/client/include/ui/home/multiplayercolumnwidget.h +++ b/doomsday/apps/client/include/ui/home/multiplayercolumnwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_HOME_MULTIPLAYERCOLUMNWIDGET_H -#define DENG_CLIENT_UI_HOME_MULTIPLAYERCOLUMNWIDGET_H +#ifndef DE_CLIENT_UI_HOME_MULTIPLAYERCOLUMNWIDGET_H +#define DE_CLIENT_UI_HOME_MULTIPLAYERCOLUMNWIDGET_H #include "columnwidget.h" @@ -31,7 +31,7 @@ class MultiplayerColumnWidget : public ColumnWidget void setHighlighted(bool highlighted) override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_HOME_MULTIPLAYERCOLUMNWIDGET_H +#endif // DE_CLIENT_UI_HOME_MULTIPLAYERCOLUMNWIDGET_H diff --git a/doomsday/apps/client/include/ui/home/multiplayerpanelbuttonwidget.h b/doomsday/apps/client/include/ui/home/multiplayerpanelbuttonwidget.h index 75035922cd..7496a53356 100644 --- a/doomsday/apps/client/include/ui/home/multiplayerpanelbuttonwidget.h +++ b/doomsday/apps/client/include/ui/home/multiplayerpanelbuttonwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_HOME_MULTIPLAYERPANELBUTTONWIDGET_H -#define DENG_CLIENT_UI_HOME_MULTIPLAYERPANELBUTTONWIDGET_H +#ifndef DE_CLIENT_UI_HOME_MULTIPLAYERPANELBUTTONWIDGET_H +#define DE_CLIENT_UI_HOME_MULTIPLAYERPANELBUTTONWIDGET_H #include "../widgets/panelbuttonwidget.h" #include @@ -28,7 +28,7 @@ class MultiplayerPanelButtonWidget : public PanelButtonWidget Q_OBJECT public: - DENG2_DEFINE_AUDIENCE2(AboutToJoin, void aboutToJoinMultiplayerGame(de::shell::ServerInfo const &)) + DE_DEFINE_AUDIENCE2(AboutToJoin, void aboutToJoinMultiplayerGame(de::shell::ServerInfo const &)) public: MultiplayerPanelButtonWidget(); @@ -44,7 +44,7 @@ public slots: void joinGame(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_HOME_MULTIPLAYERPANELBUTTONWIDGET_H +#endif // DE_CLIENT_UI_HOME_MULTIPLAYERPANELBUTTONWIDGET_H diff --git a/doomsday/apps/client/include/ui/home/nogamescolumnwidget.h b/doomsday/apps/client/include/ui/home/nogamescolumnwidget.h index ed042fb7fb..79e0e38836 100644 --- a/doomsday/apps/client/include/ui/home/nogamescolumnwidget.h +++ b/doomsday/apps/client/include/ui/home/nogamescolumnwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_HOME_NOGAMESCOLUMNWIDGET_H -#define DENG_CLIENT_UI_HOME_NOGAMESCOLUMNWIDGET_H +#ifndef DE_CLIENT_UI_HOME_NOGAMESCOLUMNWIDGET_H +#define DE_CLIENT_UI_HOME_NOGAMESCOLUMNWIDGET_H #include "columnwidget.h" @@ -34,4 +34,4 @@ public slots: void browseForDataFiles(); }; -#endif // DENG_CLIENT_UI_HOME_NOGAMESCOLUMNWIDGET_H +#endif // DE_CLIENT_UI_HOME_NOGAMESCOLUMNWIDGET_H diff --git a/doomsday/apps/client/include/ui/home/packagescolumnwidget.h b/doomsday/apps/client/include/ui/home/packagescolumnwidget.h index bdce71ee3e..f5fc171d37 100644 --- a/doomsday/apps/client/include/ui/home/packagescolumnwidget.h +++ b/doomsday/apps/client/include/ui/home/packagescolumnwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_HOME_PACKAGESCOLUMNWIDGET_H -#define DENG_CLIENT_UI_HOME_PACKAGESCOLUMNWIDGET_H +#ifndef DE_CLIENT_UI_HOME_PACKAGESCOLUMNWIDGET_H +#define DE_CLIENT_UI_HOME_PACKAGESCOLUMNWIDGET_H #include "columnwidget.h" @@ -38,7 +38,7 @@ class PackagesColumnWidget : public ColumnWidget void availablePackageCountChanged(int count); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_HOME_PACKAGESCOLUMNWIDGET_H +#endif // DE_CLIENT_UI_HOME_PACKAGESCOLUMNWIDGET_H diff --git a/doomsday/apps/client/include/ui/home/savelistwidget.h b/doomsday/apps/client/include/ui/home/savelistwidget.h index 178bd16f9c..b98f09c939 100644 --- a/doomsday/apps/client/include/ui/home/savelistwidget.h +++ b/doomsday/apps/client/include/ui/home/savelistwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_HOME_SAVELISTWIDGET_H -#define DENG_CLIENT_UI_HOME_SAVELISTWIDGET_H +#ifndef DE_CLIENT_UI_HOME_SAVELISTWIDGET_H +#define DE_CLIENT_UI_HOME_SAVELISTWIDGET_H #include #include @@ -47,7 +47,7 @@ class SaveListWidget : public de::MenuWidget void doubleClicked(de::ui::DataPos pos); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_HOME_SAVELISTWIDGET_H +#endif // DE_CLIENT_UI_HOME_SAVELISTWIDGET_H diff --git a/doomsday/apps/client/include/ui/infine/finale.h b/doomsday/apps/client/include/ui/infine/finale.h index b98e89a959..5673173e76 100644 --- a/doomsday/apps/client/include/ui/infine/finale.h +++ b/doomsday/apps/client/include/ui/infine/finale.h @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_UI_INFINE_FINALE_H -#define DENG_UI_INFINE_FINALE_H +#ifndef DE_UI_INFINE_FINALE_H +#define DE_UI_INFINE_FINALE_H #include #include @@ -43,7 +43,7 @@ class Finale { public: /// Notified when the finale is about to be deleted. - DENG2_DEFINE_AUDIENCE2(Deletion, void finaleBeingDeleted(Finale const &finale)) + DE_DEFINE_AUDIENCE2(Deletion, void finaleBeingDeleted(Finale const &finale)) public: /** @@ -78,7 +78,7 @@ class Finale FinaleInterpreter const &interpreter() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_UI_INFINE_FINALE_H +#endif // DE_UI_INFINE_FINALE_H diff --git a/doomsday/apps/client/include/ui/infine/finaleanimwidget.h b/doomsday/apps/client/include/ui/infine/finaleanimwidget.h index 529a2fe327..3e1fe53841 100644 --- a/doomsday/apps/client/include/ui/infine/finaleanimwidget.h +++ b/doomsday/apps/client/include/ui/infine/finaleanimwidget.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_UI_INFINE_FINALEANIMWIDGET_H -#define DENG_UI_INFINE_FINALEANIMWIDGET_H +#ifndef DE_UI_INFINE_FINALEANIMWIDGET_H +#define DE_UI_INFINE_FINALEANIMWIDGET_H #include #include @@ -109,9 +109,9 @@ class FinaleAnimWidget : public FinaleWidget void runTicks(/*timespan_t timeDelta*/); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; typedef FinaleAnimWidget::Frame FinaleAnimWidgetFrame; -#endif // DENG_UI_INFINE_FINALEANIMWIDGET_H +#endif // DE_UI_INFINE_FINALEANIMWIDGET_H diff --git a/doomsday/apps/client/include/ui/infine/finaleinterpreter.h b/doomsday/apps/client/include/ui/infine/finaleinterpreter.h index 276e8c9420..5f23b8d86e 100644 --- a/doomsday/apps/client/include/ui/infine/finaleinterpreter.h +++ b/doomsday/apps/client/include/ui/infine/finaleinterpreter.h @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_UI_INFINE_FINALEINTERPRETER_H -#define DENG_UI_INFINE_FINALEINTERPRETER_H +#ifndef DE_UI_INFINE_FINALEINTERPRETER_H +#define DE_UI_INFINE_FINALEINTERPRETER_H #include #include @@ -59,10 +59,10 @@ class FinaleInterpreter { public: /// An unknown widget was referenced. @ingroup errors - DENG2_ERROR(MissingWidgetError); + DE_ERROR(MissingWidgetError); /// An unknown page was referenced. @ingroup errors - DENG2_ERROR(MissingPageError); + DE_ERROR(MissingPageError); enum PageIndex { @@ -140,7 +140,7 @@ class FinaleInterpreter void setWaitText(FinaleTextWidget *newWaitText); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_UI_INFINE_FINALEINTERPRETER_H +#endif // DE_UI_INFINE_FINALEINTERPRETER_H diff --git a/doomsday/apps/client/include/ui/infine/finalepagewidget.h b/doomsday/apps/client/include/ui/infine/finalepagewidget.h index be1d0c247e..2ad26cf8e3 100644 --- a/doomsday/apps/client/include/ui/infine/finalepagewidget.h +++ b/doomsday/apps/client/include/ui/infine/finalepagewidget.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_UI_INFINE_FINALEPAGEWIDGET_H -#define DENG_UI_INFINE_FINALEPAGEWIDGET_H +#ifndef DE_UI_INFINE_FINALEPAGEWIDGET_H +#define DE_UI_INFINE_FINALEPAGEWIDGET_H #include #include @@ -36,10 +36,10 @@ class FinalePageWidget { public: /// An invalid color index was specified. @ingroup errors - DENG2_ERROR(InvalidColorError); + DE_ERROR(InvalidColorError); /// An invalid font index was specified. @ingroup errors - DENG2_ERROR(InvalidFontError); + DE_ERROR(InvalidFontError); typedef QList Children; @@ -124,7 +124,7 @@ class FinalePageWidget FinalePageWidget &setPredefinedFont(uint idx, fontid_t font); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_UI_INFINE_FINALEPAGEWIDGET_H +#endif // DE_UI_INFINE_FINALEPAGEWIDGET_H diff --git a/doomsday/apps/client/include/ui/infine/finaletextwidget.h b/doomsday/apps/client/include/ui/infine/finaletextwidget.h index dc5b0f4267..f7f79e24f0 100644 --- a/doomsday/apps/client/include/ui/infine/finaletextwidget.h +++ b/doomsday/apps/client/include/ui/infine/finaletextwidget.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_UI_INFINE_FINALETEXTWIDGET_H -#define DENG_UI_INFINE_FINALETEXTWIDGET_H +#ifndef DE_UI_INFINE_FINALETEXTWIDGET_H +#define DE_UI_INFINE_FINALETEXTWIDGET_H #include #include @@ -81,7 +81,7 @@ class FinaleTextWidget : public FinaleWidget void runTicks(); public: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_UI_INFINE_FINALETEXTWIDGET_H +#endif // DE_UI_INFINE_FINALETEXTWIDGET_H diff --git a/doomsday/apps/client/include/ui/infine/finalewidget.h b/doomsday/apps/client/include/ui/infine/finalewidget.h index b190e89d20..f15c333114 100644 --- a/doomsday/apps/client/include/ui/infine/finalewidget.h +++ b/doomsday/apps/client/include/ui/infine/finalewidget.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_UI_INFINE_FINALEWIDGET_H -#define DENG_UI_INFINE_FINALEWIDGET_H +#ifndef DE_UI_INFINE_FINALEWIDGET_H +#define DE_UI_INFINE_FINALEWIDGET_H #include #include @@ -38,13 +38,13 @@ class FinaleWidget { public: /// Notified when the InFine object is about to be deleted. - DENG2_DEFINE_AUDIENCE(Deletion, void finaleWidgetBeingDeleted(FinaleWidget const &widget)) + DE_DEFINE_AUDIENCE(Deletion, void finaleWidgetBeingDeleted(FinaleWidget const &widget)) public: explicit FinaleWidget(de::String const &name = de::String()); virtual ~FinaleWidget(); - DENG2_CAST_METHODS() + DE_CAST_METHODS() #ifdef __CLIENT__ virtual void draw(de::Vec3f const &offset) = 0; @@ -91,7 +91,7 @@ class FinaleWidget FinaleWidget &setPage(FinalePageWidget *newPage); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_UI_INFINE_FINALEWIDGET_H +#endif // DE_UI_INFINE_FINALEWIDGET_H diff --git a/doomsday/apps/client/include/ui/infine/infinesystem.h b/doomsday/apps/client/include/ui/infine/infinesystem.h index 7dddea1067..cecbf2da43 100644 --- a/doomsday/apps/client/include/ui/infine/infinesystem.h +++ b/doomsday/apps/client/include/ui/infine/infinesystem.h @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_UI_INFINESYSTEM_H -#define DENG_UI_INFINESYSTEM_H +#ifndef DE_UI_INFINESYSTEM_H +#define DE_UI_INFINESYSTEM_H #include #include @@ -34,7 +34,7 @@ class InFineSystem { public: /// The referenced Finale could not be found. @ingroup errors - DENG2_ERROR(MissingFinaleError); + DE_ERROR(MissingFinaleError); typedef QList Finales; @@ -90,7 +90,7 @@ class InFineSystem static void consoleRegister(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_UI_INFINESYSTEM_H +#endif // DE_UI_INFINESYSTEM_H diff --git a/doomsday/apps/client/include/ui/inputdebug.h b/doomsday/apps/client/include/ui/inputdebug.h index d0a9a10462..1ec39aaaf9 100644 --- a/doomsday/apps/client/include/ui/inputdebug.h +++ b/doomsday/apps/client/include/ui/inputdebug.h @@ -21,7 +21,7 @@ #include -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG /** * Render a visual representation of the current state of all input devices. @@ -33,7 +33,7 @@ void I_DebugDrawer(); */ void I_DebugDrawerConsoleRegister(); -#endif // DENG2_DEBUG +#endif // DE_DEBUG #endif // CLIENT_INPUTDEBUG_H diff --git a/doomsday/apps/client/include/ui/inputdevice.h b/doomsday/apps/client/include/ui/inputdevice.h index 7990e6e0e5..5ec552fa7a 100644 --- a/doomsday/apps/client/include/ui/inputdevice.h +++ b/doomsday/apps/client/include/ui/inputdevice.h @@ -40,10 +40,10 @@ class InputDevice { public: /// Referenced control is missing. @ingroup errors - DENG2_ERROR(MissingControlError); + DE_ERROR(MissingControlError); /// Notified when the active state of the device changes. - DENG2_DEFINE_AUDIENCE2(ActiveChange, void inputDeviceActiveChanged(InputDevice &device)) + DE_DEFINE_AUDIENCE2(ActiveChange, void inputDeviceActiveChanged(InputDevice &device)) /** * Base class for all controls. @@ -53,7 +53,7 @@ class InputDevice { public: /// No InputDevice is associated with the control. @ingroup errors - DENG2_ERROR(MissingDeviceError); + DE_ERROR(MissingDeviceError); /** * How the control state relates to binding contexts. @@ -76,7 +76,7 @@ class InputDevice explicit Control(InputDevice *device = nullptr); virtual ~Control(); - DENG2_CAST_METHODS() + DE_CAST_METHODS() /** * Returns @c true if the control is presently in its default state. @@ -186,7 +186,7 @@ class InputDevice virtual void consoleRegister() {} private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; public: @@ -345,7 +345,7 @@ class InputDevice void consoleRegister(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; Q_DECLARE_OPERATORS_FOR_FLAGS(InputDevice::Control::BindContextAssociation) diff --git a/doomsday/apps/client/include/ui/inputsystem.h b/doomsday/apps/client/include/ui/inputsystem.h index 72dd548af5..71c9c89c2f 100644 --- a/doomsday/apps/client/include/ui/inputsystem.h +++ b/doomsday/apps/client/include/ui/inputsystem.h @@ -73,7 +73,7 @@ class InputSystem : public de::System public: // Input devices ----------------------------------------------------- /// Required/referenced input device is missing. @ingroup errors - DENG2_ERROR(MissingDeviceError); + DE_ERROR(MissingDeviceError); /* * Lookup an InputDevice by it's unique @a id. @@ -173,7 +173,7 @@ class InputSystem : public de::System public: // Binding (context) management -------------------------------------- /// Required/referenced binding context is missing. @ingroup errors - DENG2_ERROR(MissingContextError); + DE_ERROR(MissingContextError); void bindDefaults(); @@ -285,7 +285,7 @@ class InputSystem : public de::System static void consoleRegister(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // CLIENT_INPUTSYSTEM_H diff --git a/doomsday/apps/client/include/ui/joystick.h b/doomsday/apps/client/include/ui/joystick.h index 2d59f66540..67081a294b 100644 --- a/doomsday/apps/client/include/ui/joystick.h +++ b/doomsday/apps/client/include/ui/joystick.h @@ -21,8 +21,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_UI_JOYSTICK_H -#define DENG_CLIENT_UI_JOYSTICK_H +#ifndef DE_CLIENT_UI_JOYSTICK_H +#define DE_CLIENT_UI_JOYSTICK_H #ifdef __SERVER__ # error Joystick is not available in a SERVER build @@ -59,4 +59,4 @@ void Joystick_GetState(joystate_t *state); de::String Joystick_Name(); -#endif // DENG_CLIENT_UI_JOYSTICK_H +#endif // DE_CLIENT_UI_JOYSTICK_H diff --git a/doomsday/apps/client/include/ui/nativemenu.h b/doomsday/apps/client/include/ui/nativemenu.h index 6ac3225f6a..31a3cafc51 100644 --- a/doomsday/apps/client/include/ui/nativemenu.h +++ b/doomsday/apps/client/include/ui/nativemenu.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_NATIVEMENU_H -#define DENG_CLIENT_NATIVEMENU_H +#ifndef DE_CLIENT_NATIVEMENU_H +#define DE_CLIENT_NATIVEMENU_H #include @@ -32,7 +32,7 @@ class NativeMenu : public QObject NativeMenu(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_NATIVEMENU_H +#endif // DE_CLIENT_NATIVEMENU_H diff --git a/doomsday/apps/client/include/ui/nativeui.h b/doomsday/apps/client/include/ui/nativeui.h index e38b2f300b..84ca4394a2 100644 --- a/doomsday/apps/client/include/ui/nativeui.h +++ b/doomsday/apps/client/include/ui/nativeui.h @@ -20,8 +20,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_NATIVEUI_H -#define LIBDENG_NATIVEUI_H +#ifndef DE_NATIVEUI_H +#define DE_NATIVEUI_H #ifdef __cplusplus extern "C" { @@ -73,4 +73,4 @@ void Sys_MessageBoxWithDetailsFromFile(messageboxtype_t type, const char* title, } // extern "C" #endif -#endif // LIBDENG_NATIVEUI_H +#endif // DE_NATIVEUI_H diff --git a/doomsday/apps/client/include/ui/postprocessing.h b/doomsday/apps/client/include/ui/postprocessing.h index 90df9ca83a..a7e659ac04 100644 --- a/doomsday/apps/client/include/ui/postprocessing.h +++ b/doomsday/apps/client/include/ui/postprocessing.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_FX_POSTPROCESSING_H -#define DENG_CLIENT_FX_POSTPROCESSING_H +#ifndef DE_CLIENT_FX_POSTPROCESSING_H +#define DE_CLIENT_FX_POSTPROCESSING_H #include "render/consoleeffect.h" #include @@ -70,7 +70,7 @@ class PostProcessing static void consoleRegister(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_FX_POSTPROCESSING_H +#endif // DE_CLIENT_FX_POSTPROCESSING_H diff --git a/doomsday/apps/client/include/ui/progress.h b/doomsday/apps/client/include/ui/progress.h index 9b3496015d..85bb76df4f 100644 --- a/doomsday/apps/client/include/ui/progress.h +++ b/doomsday/apps/client/include/ui/progress.h @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_CONSOLE_PROGRESSBAR_H -#define LIBDENG_CONSOLE_PROGRESSBAR_H +#ifndef DE_CONSOLE_PROGRESSBAR_H +#define DE_CONSOLE_PROGRESSBAR_H #include "dd_types.h" @@ -50,4 +50,4 @@ dd_bool Con_IsProgressAnimationCompleted(void); } // extern "C" #endif -#endif // LIBDENG_CONSOLE_PROGRESSBAR_H +#endif // DE_CONSOLE_PROGRESSBAR_H diff --git a/doomsday/apps/client/include/ui/savelistdata.h b/doomsday/apps/client/include/ui/savelistdata.h index c7340ca40c..ef54436178 100644 --- a/doomsday/apps/client/include/ui/savelistdata.h +++ b/doomsday/apps/client/include/ui/savelistdata.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_SAVELISTDATA_H -#define DENG_CLIENT_UI_SAVELISTDATA_H +#ifndef DE_CLIENT_UI_SAVELISTDATA_H +#define DE_CLIENT_UI_SAVELISTDATA_H #include #include @@ -30,7 +30,7 @@ class SaveListData : public de::ui::ListData { public: struct SaveItem : public de::ui::ImageItem, - DENG2_OBSERVES(de::File, Deletion) + DE_OBSERVES(de::File, Deletion) { GameStateFolder const *saveFolder; @@ -54,7 +54,7 @@ class SaveListData : public de::ui::ListData SaveItem const &at(Pos pos) const override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_SAVELISTDATA_H +#endif // DE_CLIENT_UI_SAVELISTDATA_H diff --git a/doomsday/apps/client/include/ui/styledlogsinkformatter.h b/doomsday/apps/client/include/ui/styledlogsinkformatter.h index 03c56ac60d..cb56d81c7a 100644 --- a/doomsday/apps/client/include/ui/styledlogsinkformatter.h +++ b/doomsday/apps/client/include/ui/styledlogsinkformatter.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_STYLEDLOGSINKFORMATTER_H -#define DENG_CLIENT_STYLEDLOGSINKFORMATTER_H +#ifndef DE_CLIENT_STYLEDLOGSINKFORMATTER_H +#define DE_CLIENT_STYLEDLOGSINKFORMATTER_H #include #include @@ -42,7 +42,7 @@ class StyledLogSinkFormatter : public de::LogSink::IFormatter void setOmitSectionIfNonDev(bool omit); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_STYLEDLOGSINKFORMATTER_H +#endif // DE_CLIENT_STYLEDLOGSINKFORMATTER_H diff --git a/doomsday/apps/client/include/ui/sys_input.h b/doomsday/apps/client/include/ui/sys_input.h index e311666c4e..fd7a19b1a4 100644 --- a/doomsday/apps/client/include/ui/sys_input.h +++ b/doomsday/apps/client/include/ui/sys_input.h @@ -23,8 +23,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_SYSTEM_INPUT_H -#define LIBDENG_SYSTEM_INPUT_H +#ifndef DE_SYSTEM_INPUT_H +#define DE_SYSTEM_INPUT_H #ifndef __CLIENT__ # error "Input requires __CLIENT__" diff --git a/doomsday/apps/client/include/ui/ui_main.h b/doomsday/apps/client/include/ui/ui_main.h index c5c5a694b8..d9d1d72cbd 100644 --- a/doomsday/apps/client/include/ui/ui_main.h +++ b/doomsday/apps/client/include/ui/ui_main.h @@ -19,8 +19,8 @@ * http://www.gnu.org/licenses */ -#ifndef LIBDENG_UI_MAIN_H -#define LIBDENG_UI_MAIN_H +#ifndef DE_UI_MAIN_H +#define DE_UI_MAIN_H #include #include "ddevent.h" @@ -69,7 +69,7 @@ typedef struct { float red, green, blue; } ui_color_t; -DENG_EXTERN_C fontid_t fontFixed; //, fontVariable[FONTSTYLE_COUNT]; +DE_EXTERN_C fontid_t fontFixed; //, fontVariable[FONTSTYLE_COUNT]; //void UI_Register(void); diff --git a/doomsday/apps/client/include/ui/viewcompositor.h b/doomsday/apps/client/include/ui/viewcompositor.h index 02e6f056dd..639e884703 100644 --- a/doomsday/apps/client/include/ui/viewcompositor.h +++ b/doomsday/apps/client/include/ui/viewcompositor.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_VIEWCOMPOSITOR_H -#define DENG_CLIENT_UI_VIEWCOMPOSITOR_H +#ifndef DE_CLIENT_UI_VIEWCOMPOSITOR_H +#define DE_CLIENT_UI_VIEWCOMPOSITOR_H #include @@ -83,7 +83,7 @@ class ViewCompositor PostProcessing &postProcessing(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_VIEWCOMPOSITOR_H +#endif // DE_CLIENT_UI_VIEWCOMPOSITOR_H diff --git a/doomsday/apps/client/include/ui/widgets/busywidget.h b/doomsday/apps/client/include/ui/widgets/busywidget.h index c590264a90..8675072df7 100644 --- a/doomsday/apps/client/include/ui/widgets/busywidget.h +++ b/doomsday/apps/client/include/ui/widgets/busywidget.h @@ -52,7 +52,7 @@ class BusyWidget : public de::GuiWidget void glDeinit(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // CLIENT_BUSYWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/consolecommandwidget.h b/doomsday/apps/client/include/ui/widgets/consolecommandwidget.h index 00d8a0250f..1ee393050f 100644 --- a/doomsday/apps/client/include/ui/widgets/consolecommandwidget.h +++ b/doomsday/apps/client/include/ui/widgets/consolecommandwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_CONSOLECOMMANDWIDGET_H -#define DENG_CLIENT_CONSOLECOMMANDWIDGET_H +#ifndef DE_CLIENT_CONSOLECOMMANDWIDGET_H +#define DE_CLIENT_CONSOLECOMMANDWIDGET_H #include @@ -46,7 +46,7 @@ class ConsoleCommandWidget : public de::CommandWidget void autoCompletionBegan(de::String const &prefix); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_CONSOLECOMMANDWIDGET_H +#endif // DE_CLIENT_CONSOLECOMMANDWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/consolewidget.h b/doomsday/apps/client/include/ui/widgets/consolewidget.h index be1ea78f05..5d4a5094d1 100644 --- a/doomsday/apps/client/include/ui/widgets/consolewidget.h +++ b/doomsday/apps/client/include/ui/widgets/consolewidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_CONSOLEWIDGET_H -#define DENG_CLIENT_CONSOLEWIDGET_H +#ifndef DE_CLIENT_CONSOLEWIDGET_H +#define DE_CLIENT_CONSOLEWIDGET_H #include #include @@ -86,7 +86,7 @@ public slots: void focusOnCommandLine(); void closeMenu(); void commandWasEntered(de::String const &); -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) void copyLogPathToClipboard(); #endif @@ -94,7 +94,7 @@ protected slots: void logContentHeightIncreased(int delta); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_CONSOLEWIDGET_H +#endif // DE_CLIENT_CONSOLEWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/cvarchoicewidget.h b/doomsday/apps/client/include/ui/widgets/cvarchoicewidget.h index d1bc85092f..f378c7f9a1 100644 --- a/doomsday/apps/client/include/ui/widgets/cvarchoicewidget.h +++ b/doomsday/apps/client/include/ui/widgets/cvarchoicewidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_CVARCHOICEWIDGET_H -#define DENG_CLIENT_CVARCHOICEWIDGET_H +#ifndef DE_CLIENT_CVARCHOICEWIDGET_H +#define DE_CLIENT_CVARCHOICEWIDGET_H #include #include "icvarwidget.h" @@ -42,7 +42,7 @@ protected slots: void setCVarValueFromWidget(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_CVARCHOICEWIDGET_H +#endif // DE_CLIENT_CVARCHOICEWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/cvarlineeditwidget.h b/doomsday/apps/client/include/ui/widgets/cvarlineeditwidget.h index c6d98c5119..7df7965b2e 100644 --- a/doomsday/apps/client/include/ui/widgets/cvarlineeditwidget.h +++ b/doomsday/apps/client/include/ui/widgets/cvarlineeditwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_CVARLINEEDITWIDGET_H -#define DENG_CLIENT_CVARLINEEDITWIDGET_H +#ifndef DE_CLIENT_CVARLINEEDITWIDGET_H +#define DE_CLIENT_CVARLINEEDITWIDGET_H #include #include "icvarwidget.h" @@ -45,7 +45,7 @@ protected slots: void contentChanged(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_CVARLINEEDITWIDGET_H +#endif // DE_CLIENT_CVARLINEEDITWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/cvarnativepathwidget.h b/doomsday/apps/client/include/ui/widgets/cvarnativepathwidget.h index 1c96e30d9e..c727a206c4 100644 --- a/doomsday/apps/client/include/ui/widgets/cvarnativepathwidget.h +++ b/doomsday/apps/client/include/ui/widgets/cvarnativepathwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_CVARNATIVEPATHWIDGET_H -#define DENG_CLIENT_CVARNATIVEPATHWIDGET_H +#ifndef DE_CLIENT_CVARNATIVEPATHWIDGET_H +#define DE_CLIENT_CVARNATIVEPATHWIDGET_H #include "nativepathwidget.h" #include "icvarwidget.h" @@ -40,7 +40,7 @@ protected slots: void setCVarValueFromWidget(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_CVARNATIVEPATHWIDGET_H +#endif // DE_CLIENT_CVARNATIVEPATHWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/cvarsliderwidget.h b/doomsday/apps/client/include/ui/widgets/cvarsliderwidget.h index f154c33881..c8d22ad0ba 100644 --- a/doomsday/apps/client/include/ui/widgets/cvarsliderwidget.h +++ b/doomsday/apps/client/include/ui/widgets/cvarsliderwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_CVARSLIDERWIDGET_H -#define DENG_CLIENT_CVARSLIDERWIDGET_H +#ifndef DE_CLIENT_CVARSLIDERWIDGET_H +#define DE_CLIENT_CVARSLIDERWIDGET_H #include #include "icvarwidget.h" @@ -39,7 +39,7 @@ public slots: void setCVarValueFromWidget(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_CVARSLIDERWIDGET_H +#endif // DE_CLIENT_CVARSLIDERWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/cvartogglewidget.h b/doomsday/apps/client/include/ui/widgets/cvartogglewidget.h index 5fcfe1370f..22486b1865 100644 --- a/doomsday/apps/client/include/ui/widgets/cvartogglewidget.h +++ b/doomsday/apps/client/include/ui/widgets/cvartogglewidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_CVARTOGGLEWIDGET_H -#define DENG_CLIENT_CVARTOGGLEWIDGET_H +#ifndef DE_CLIENT_CVARTOGGLEWIDGET_H +#define DE_CLIENT_CVARTOGGLEWIDGET_H #include #include "icvarwidget.h" @@ -41,7 +41,7 @@ protected slots: void setCVarValueFromWidget(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_CVARTOGGLEWIDGET_H +#endif // DE_CLIENT_CVARTOGGLEWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/gamewidget.h b/doomsday/apps/client/include/ui/widgets/gamewidget.h index a5043d4efd..a88c43b351 100644 --- a/doomsday/apps/client/include/ui/widgets/gamewidget.h +++ b/doomsday/apps/client/include/ui/widgets/gamewidget.h @@ -51,7 +51,7 @@ class GameWidget : public de::GuiWidget void glDeinit() override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // CLIENT_GAMEWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/homeitemwidget.h b/doomsday/apps/client/include/ui/widgets/homeitemwidget.h index 7e468c7b3c..81a68a6252 100644 --- a/doomsday/apps/client/include/ui/widgets/homeitemwidget.h +++ b/doomsday/apps/client/include/ui/widgets/homeitemwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_HOME_HOMEITEMWIDGET_H -#define DENG_CLIENT_UI_HOME_HOMEITEMWIDGET_H +#ifndef DE_CLIENT_UI_HOME_HOMEITEMWIDGET_H +#define DE_CLIENT_UI_HOME_HOMEITEMWIDGET_H #include #include @@ -88,9 +88,9 @@ class HomeItemWidget : public de::GuiWidget, public de::IAssetGroup //void deselected(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; Q_DECLARE_OPERATORS_FOR_FLAGS(HomeItemWidget::Flags) -#endif // DENG_CLIENT_UI_HOME_HOMEITEMWIDGET_H +#endif // DE_CLIENT_UI_HOME_HOMEITEMWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/homemenuwidget.h b/doomsday/apps/client/include/ui/widgets/homemenuwidget.h index 164f98cf35..aad50a737b 100644 --- a/doomsday/apps/client/include/ui/widgets/homemenuwidget.h +++ b/doomsday/apps/client/include/ui/widgets/homemenuwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_HOME_HOMEMENUWIDGET_H -#define DENG_CLIENT_UI_HOME_HOMEMENUWIDGET_H +#ifndef DE_CLIENT_UI_HOME_HOMEMENUWIDGET_H +#define DE_CLIENT_UI_HOME_HOMEMENUWIDGET_H #include @@ -70,7 +70,7 @@ protected slots: void itemSelectionChanged(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_HOME_HOMEMENUWIDGET_H +#endif // DE_CLIENT_UI_HOME_HOMEMENUWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/icvarwidget.h b/doomsday/apps/client/include/ui/widgets/icvarwidget.h index 99401cb9c8..8ed7a31163 100644 --- a/doomsday/apps/client/include/ui/widgets/icvarwidget.h +++ b/doomsday/apps/client/include/ui/widgets/icvarwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_ICVARWIDGET_H -#define DENG_CLIENT_ICVARWIDGET_H +#ifndef DE_CLIENT_ICVARWIDGET_H +#define DE_CLIENT_ICVARWIDGET_H /** * Interface for console variable widgets. @@ -31,4 +31,4 @@ class ICVarWidget virtual void updateFromCVar() = 0; }; -#endif // DENG_CLIENT_ICVARWIDGET_H +#endif // DE_CLIENT_ICVARWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/inputbindingwidget.h b/doomsday/apps/client/include/ui/widgets/inputbindingwidget.h index 89fd80bd40..2ba1335ba4 100644 --- a/doomsday/apps/client/include/ui/widgets/inputbindingwidget.h +++ b/doomsday/apps/client/include/ui/widgets/inputbindingwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_INPUTBINDINGWIDGET_H -#define DENG_CLIENT_INPUTBINDINGWIDGET_H +#ifndef DE_CLIENT_INPUTBINDINGWIDGET_H +#define DE_CLIENT_INPUTBINDINGWIDGET_H #include @@ -58,7 +58,7 @@ class InputBindingWidget : public de::AuxButtonWidget static InputBindingWidget *newTaskBarShortcut(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_INPUTBINDINGWIDGET_H +#endif // DE_CLIENT_INPUTBINDINGWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/keygrabberwidget.h b/doomsday/apps/client/include/ui/widgets/keygrabberwidget.h index ff1dbf1c92..69bcdfee2f 100644 --- a/doomsday/apps/client/include/ui/widgets/keygrabberwidget.h +++ b/doomsday/apps/client/include/ui/widgets/keygrabberwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_KEYGRABBERWIDGET_H -#define DENG_CLIENT_KEYGRABBERWIDGET_H +#ifndef DE_CLIENT_KEYGRABBERWIDGET_H +#define DE_CLIENT_KEYGRABBERWIDGET_H #include @@ -33,7 +33,7 @@ class KeyGrabberWidget : public de::LabelWidget bool handleEvent(de::Event const &event); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_KEYGRABBERWIDGET_H +#endif // DE_CLIENT_KEYGRABBERWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/mapoutlinewidget.h b/doomsday/apps/client/include/ui/widgets/mapoutlinewidget.h index 7a84bb531b..2ab4b103e1 100644 --- a/doomsday/apps/client/include/ui/widgets/mapoutlinewidget.h +++ b/doomsday/apps/client/include/ui/widgets/mapoutlinewidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_MAPOUTLINEWIDGET_H -#define DENG_CLIENT_UI_MAPOUTLINEWIDGET_H +#ifndef DE_CLIENT_UI_MAPOUTLINEWIDGET_H +#define DE_CLIENT_UI_MAPOUTLINEWIDGET_H #include #include @@ -40,7 +40,7 @@ class MapOutlineWidget : public de::GuiWidget void glDeinit() override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_MAPOUTLINEWIDGET_H +#endif // DE_CLIENT_UI_MAPOUTLINEWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/multiplayerservermenuwidget.h b/doomsday/apps/client/include/ui/widgets/multiplayerservermenuwidget.h index 0ef63fb0da..657595e246 100644 --- a/doomsday/apps/client/include/ui/widgets/multiplayerservermenuwidget.h +++ b/doomsday/apps/client/include/ui/widgets/multiplayerservermenuwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_MULTIPLAYERSERVERMENUWIDGET_H -#define DENG_CLIENT_UI_MULTIPLAYERSERVERMENUWIDGET_H +#ifndef DE_CLIENT_UI_MULTIPLAYERSERVERMENUWIDGET_H +#define DE_CLIENT_UI_MULTIPLAYERSERVERMENUWIDGET_H #include "homemenuwidget.h" #include @@ -28,7 +28,7 @@ class MultiplayerServerMenuWidget : public HomeMenuWidget { public: - DENG2_DEFINE_AUDIENCE2(AboutToJoin, void aboutToJoinMultiplayerGame(de::shell::ServerInfo const &)) + DE_DEFINE_AUDIENCE2(AboutToJoin, void aboutToJoinMultiplayerGame(de::shell::ServerInfo const &)) enum DiscoveryMode { NoDiscovery, @@ -40,7 +40,7 @@ class MultiplayerServerMenuWidget : public HomeMenuWidget de::String const &name = de::String()); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UIMULTIPLAYERSERVERMENUWIDGET_H +#endif // DE_CLIENT_UIMULTIPLAYERSERVERMENUWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/multiplayerstatuswidget.h b/doomsday/apps/client/include/ui/widgets/multiplayerstatuswidget.h index 8cf2afcef2..f737e54faa 100644 --- a/doomsday/apps/client/include/ui/widgets/multiplayerstatuswidget.h +++ b/doomsday/apps/client/include/ui/widgets/multiplayerstatuswidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_MULTIPLAYERSTATUSWIDGET_H -#define DENG_CLIENT_MULTIPLAYERSTATUSWIDGET_H +#ifndef DE_CLIENT_MULTIPLAYERSTATUSWIDGET_H +#define DE_CLIENT_MULTIPLAYERSTATUSWIDGET_H #include @@ -41,7 +41,7 @@ public slots: void panelClosing(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_MULTIPLAYERSTATUSWIDGET_H +#endif // DE_CLIENT_MULTIPLAYERSTATUSWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/packagecontentoptionswidget.h b/doomsday/apps/client/include/ui/widgets/packagecontentoptionswidget.h index 4309452fd9..d1436859ba 100644 --- a/doomsday/apps/client/include/ui/widgets/packagecontentoptionswidget.h +++ b/doomsday/apps/client/include/ui/widgets/packagecontentoptionswidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_PACKAGECONTENTOPTIONSWIDGET_H -#define DENG_CLIENT_UI_PACKAGECONTENTOPTIONSWIDGET_H +#ifndef DE_CLIENT_UI_PACKAGECONTENTOPTIONSWIDGET_H +#define DE_CLIENT_UI_PACKAGECONTENTOPTIONSWIDGET_H #include @@ -36,7 +36,7 @@ class PackageContentOptionsWidget : public de::GuiWidget de::Rule const &maxHeight); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_PACKAGECONTENTOPTIONSWIDGET_H +#endif // DE_CLIENT_UI_PACKAGECONTENTOPTIONSWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/packagesbuttonwidget.h b/doomsday/apps/client/include/ui/widgets/packagesbuttonwidget.h index 90eb9dac56..e5045edf2f 100644 --- a/doomsday/apps/client/include/ui/widgets/packagesbuttonwidget.h +++ b/doomsday/apps/client/include/ui/widgets/packagesbuttonwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_PACKAGESBUTTONWIDGET_H -#define DENG_CLIENT_UI_PACKAGESBUTTONWIDGET_H +#ifndef DE_CLIENT_UI_PACKAGESBUTTONWIDGET_H +#define DE_CLIENT_UI_PACKAGESBUTTONWIDGET_H #include "ui/dialogs/packagesdialog.h" @@ -50,7 +50,7 @@ class PackagesButtonWidget : public de::ButtonWidget void packageSelectionChanged(QStringList packageIds); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_PACKAGESBUTTONWIDGET_H +#endif // DE_CLIENT_UI_PACKAGESBUTTONWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/packagessidebarwidget.h b/doomsday/apps/client/include/ui/widgets/packagessidebarwidget.h index e1e2f347cb..3618cf2447 100644 --- a/doomsday/apps/client/include/ui/widgets/packagessidebarwidget.h +++ b/doomsday/apps/client/include/ui/widgets/packagessidebarwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_PACKAGESSIDEBARWIDGET_H -#define DENG_CLIENT_UI_PACKAGESSIDEBARWIDGET_H +#ifndef DE_CLIENT_UI_PACKAGESSIDEBARWIDGET_H +#define DE_CLIENT_UI_PACKAGESSIDEBARWIDGET_H #include "ui/widgets/sidebarwidget.h" @@ -30,7 +30,7 @@ class PackagesSidebarWidget : public SidebarWidget PackagesSidebarWidget(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_PACKAGESSIDEBARWIDGET_H +#endif // DE_CLIENT_UI_PACKAGESSIDEBARWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/packageswidget.h b/doomsday/apps/client/include/ui/widgets/packageswidget.h index 47528ff558..5c14eed3e3 100644 --- a/doomsday/apps/client/include/ui/widgets/packageswidget.h +++ b/doomsday/apps/client/include/ui/widgets/packageswidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_HOME_PACKAGESWIDGET_H -#define DENG_CLIENT_UI_HOME_PACKAGESWIDGET_H +#ifndef DE_CLIENT_UI_HOME_PACKAGESWIDGET_H +#define DE_CLIENT_UI_HOME_PACKAGESWIDGET_H #include #include @@ -38,7 +38,7 @@ class PackagesWidget : public de::GuiWidget, public de::IPersistent public: /// Specified manual package is not available. @ingroup errors - DENG2_ERROR(UnavailableError); + DE_ERROR(UnavailableError); /// Determines whether an item should be shown as highlighted or not. class IPackageStatus @@ -124,7 +124,7 @@ class PackagesWidget : public de::GuiWidget, public de::IPersistent void itemCountChanged(unsigned int shownItems, unsigned int totalItems); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_HOME_PACKAGESWIDGET_H +#endif // DE_CLIENT_UI_HOME_PACKAGESWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/panelbuttonwidget.h b/doomsday/apps/client/include/ui/widgets/panelbuttonwidget.h index 68f4ce3a9f..5fa98528ae 100644 --- a/doomsday/apps/client/include/ui/widgets/panelbuttonwidget.h +++ b/doomsday/apps/client/include/ui/widgets/panelbuttonwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_PANELBUTTONWIDGET_H -#define DENG_CLIENT_UI_PANELBUTTONWIDGET_H +#ifndef DE_CLIENT_UI_PANELBUTTONWIDGET_H +#define DE_CLIENT_UI_PANELBUTTONWIDGET_H #include "ui/widgets/homeitemwidget.h" @@ -38,7 +38,7 @@ class PanelButtonWidget : public HomeItemWidget void setSelected(bool selected) override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_PANELBUTTONWIDGET_H +#endif // DE_CLIENT_UI_PANELBUTTONWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/privilegedlogwidget.h b/doomsday/apps/client/include/ui/widgets/privilegedlogwidget.h index 99d0078c0c..0a76f9d10b 100644 --- a/doomsday/apps/client/include/ui/widgets/privilegedlogwidget.h +++ b/doomsday/apps/client/include/ui/widgets/privilegedlogwidget.h @@ -40,7 +40,7 @@ public slots: void updateStyle() override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; diff --git a/doomsday/apps/client/include/ui/widgets/profilepickerwidget.h b/doomsday/apps/client/include/ui/widgets/profilepickerwidget.h index 5b96205f55..71b2b7e25b 100644 --- a/doomsday/apps/client/include/ui/widgets/profilepickerwidget.h +++ b/doomsday/apps/client/include/ui/widgets/profilepickerwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_PROFILEPICKERWIDGET_H -#define DENG_CLIENT_PROFILEPICKERWIDGET_H +#ifndef DE_CLIENT_PROFILEPICKERWIDGET_H +#define DE_CLIENT_PROFILEPICKERWIDGET_H #include #include "ConfigProfiles" @@ -66,7 +66,7 @@ public slots: void updateStyle(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_PROFILEPICKERWIDGET_H +#endif // DE_CLIENT_PROFILEPICKERWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/sidebarwidget.h b/doomsday/apps/client/include/ui/widgets/sidebarwidget.h index efced56815..0c38f87cc2 100644 --- a/doomsday/apps/client/include/ui/widgets/sidebarwidget.h +++ b/doomsday/apps/client/include/ui/widgets/sidebarwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UI_SIDEBARWIDGET_H -#define DENG_CLIENT_UI_SIDEBARWIDGET_H +#ifndef DE_CLIENT_UI_SIDEBARWIDGET_H +#define DE_CLIENT_UI_SIDEBARWIDGET_H #include #include @@ -54,8 +54,8 @@ class SidebarWidget : public de::PanelWidget void panelDismissed(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UI_SIDEBARWIDGET_H +#endif // DE_CLIENT_UI_SIDEBARWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/taskbarwidget.h b/doomsday/apps/client/include/ui/widgets/taskbarwidget.h index 4f287d279c..ccd877145f 100644 --- a/doomsday/apps/client/include/ui/widgets/taskbarwidget.h +++ b/doomsday/apps/client/include/ui/widgets/taskbarwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_TASKBARWIDGET_H -#define DENG_CLIENT_TASKBARWIDGET_H +#ifndef DE_CLIENT_TASKBARWIDGET_H +#define DE_CLIENT_TASKBARWIDGET_H #include #include @@ -66,7 +66,7 @@ public slots: void connectToServerManually(); void showTutorial(); void openPackagesSidebar(); -#if defined (DENG_HAVE_UPDATER) +#if defined (DE_HAVE_UPDATER) void showUpdaterSettings(); #endif @@ -82,7 +82,7 @@ protected slots: void glDeinit(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_TASKBARWIDGET_H +#endif // DE_CLIENT_TASKBARWIDGET_H diff --git a/doomsday/apps/client/include/ui/widgets/tutorialwidget.h b/doomsday/apps/client/include/ui/widgets/tutorialwidget.h index 2ee80d66c4..7af28f6cf8 100644 --- a/doomsday/apps/client/include/ui/widgets/tutorialwidget.h +++ b/doomsday/apps/client/include/ui/widgets/tutorialwidget.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_TUTORIALWIDGET_H -#define DENG_CLIENT_TUTORIALWIDGET_H +#ifndef DE_CLIENT_TUTORIALWIDGET_H +#define DE_CLIENT_TUTORIALWIDGET_H #include @@ -41,7 +41,7 @@ public slots: void flashHighlight(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_TUTORIALWIDGET_H +#endif // DE_CLIENT_TUTORIALWIDGET_H diff --git a/doomsday/apps/client/include/ui/zonedebug.h b/doomsday/apps/client/include/ui/zonedebug.h index 715ba73b3d..c182886100 100644 --- a/doomsday/apps/client/include/ui/zonedebug.h +++ b/doomsday/apps/client/include/ui/zonedebug.h @@ -23,7 +23,7 @@ #define CLIENT_ZONEDEBUG_H #include -#if defined (DENG_DEBUG) && defined (DENG_OPENGL) +#if defined (DE_DEBUG) && defined (DE_OPENGL) #ifdef __cplusplus extern "C" { @@ -35,6 +35,6 @@ void Z_DebugDrawer(void); } // extern "C" #endif -#endif // DENG_DEBUG +#endif // DE_DEBUG #endif // CLIENT_ZONEDEBUG_H diff --git a/doomsday/apps/client/include/unix/dd_uinit.h b/doomsday/apps/client/include/unix/dd_uinit.h index 684d3aa2bd..19f9d4a97a 100644 --- a/doomsday/apps/client/include/unix/dd_uinit.h +++ b/doomsday/apps/client/include/unix/dd_uinit.h @@ -21,8 +21,8 @@ * Unix Initialization. */ -#ifndef LIBDENG_UINIT_H -#define LIBDENG_UINIT_H +#ifndef DE_UINIT_H +#define DE_UINIT_H #include "dd_pinit.h" @@ -37,4 +37,4 @@ void DD_Shutdown(void); } // extern "C" #endif -#endif /* LIBDENG_UINIT_H */ +#endif /* DE_UINIT_H */ diff --git a/doomsday/apps/client/include/updater.h b/doomsday/apps/client/include/updater.h index a48dba35cd..99232f078d 100644 --- a/doomsday/apps/client/include/updater.h +++ b/doomsday/apps/client/include/updater.h @@ -24,8 +24,8 @@ * @defgroup updater Automatic Updater */ -#ifndef LIBDENG_UPDATER_H -#define LIBDENG_UPDATER_H +#ifndef DE_UPDATER_H +#define DE_UPDATER_H #ifndef __CLIENT__ # error "updater.h is only for the client" @@ -101,7 +101,7 @@ protected slots: void downloadDialogClosed(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // LIBDENG_UPDATER_H +#endif // DE_UPDATER_H diff --git a/doomsday/apps/client/include/updater/processcheckdialog.h b/doomsday/apps/client/include/updater/processcheckdialog.h index 1a43429e7c..54dac05dda 100644 --- a/doomsday/apps/client/include/updater/processcheckdialog.h +++ b/doomsday/apps/client/include/updater/processcheckdialog.h @@ -22,8 +22,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_PROCESSCHECKDIALOG_H -#define DENG_CLIENT_PROCESSCHECKDIALOG_H +#ifndef DE_CLIENT_PROCESSCHECKDIALOG_H +#define DE_CLIENT_PROCESSCHECKDIALOG_H #include @@ -45,4 +45,4 @@ dd_bool Updater_AskToStopProcess(char const *processName, char const *message); #endif // WIN32 -#endif // DENG_CLIENT_PROCESSCHECKDIALOG_H +#endif // DE_CLIENT_PROCESSCHECKDIALOG_H diff --git a/doomsday/apps/client/include/updater/updateavailabledialog.h b/doomsday/apps/client/include/updater/updateavailabledialog.h index 8182ac54cc..5c7428ae6e 100644 --- a/doomsday/apps/client/include/updater/updateavailabledialog.h +++ b/doomsday/apps/client/include/updater/updateavailabledialog.h @@ -20,8 +20,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_UPDATEAVAILABLEDIALOG_H -#define DENG_CLIENT_UPDATEAVAILABLEDIALOG_H +#ifndef DE_CLIENT_UPDATEAVAILABLEDIALOG_H +#define DE_CLIENT_UPDATEAVAILABLEDIALOG_H #include #include @@ -46,7 +46,7 @@ public slots: void checkAgain(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // LIBDENG_UPDATEAVAILABLEDIALOG_H +#endif // DE_UPDATEAVAILABLEDIALOG_H diff --git a/doomsday/apps/client/include/updater/updatedownloaddialog.h b/doomsday/apps/client/include/updater/updatedownloaddialog.h index 472eca6f21..496b79b5e7 100644 --- a/doomsday/apps/client/include/updater/updatedownloaddialog.h +++ b/doomsday/apps/client/include/updater/updatedownloaddialog.h @@ -19,8 +19,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_UPDATEDOWNLOADDIALOG_H -#define DENG_CLIENT_UPDATEDOWNLOADDIALOG_H +#ifndef DE_CLIENT_UPDATEDOWNLOADDIALOG_H +#define DE_CLIENT_UPDATEDOWNLOADDIALOG_H #include "ui/dialogs/downloaddialog.h" @@ -65,7 +65,7 @@ public slots: void cancel() override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UPDATEDOWNLOADDIALOG_H +#endif // DE_CLIENT_UPDATEDOWNLOADDIALOG_H diff --git a/doomsday/apps/client/include/updater/updatersettings.h b/doomsday/apps/client/include/updater/updatersettings.h index 60ce49c6ed..7dc491647a 100644 --- a/doomsday/apps/client/include/updater/updatersettings.h +++ b/doomsday/apps/client/include/updater/updatersettings.h @@ -20,8 +20,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_UPDATERSETTINGS_H -#define DENG_CLIENT_UPDATERSETTINGS_H +#ifndef DE_CLIENT_UPDATERSETTINGS_H +#define DE_CLIENT_UPDATERSETTINGS_H #include #include @@ -82,4 +82,4 @@ class UpdaterSettings static de::NativePath defaultDownloadPath(); }; -#endif // DENG_CLIENT_UPDATERSETTINGS_H +#endif // DE_CLIENT_UPDATERSETTINGS_H diff --git a/doomsday/apps/client/include/updater/updatersettingsdialog.h b/doomsday/apps/client/include/updater/updatersettingsdialog.h index 72567f85fe..b55f2e2350 100644 --- a/doomsday/apps/client/include/updater/updatersettingsdialog.h +++ b/doomsday/apps/client/include/updater/updatersettingsdialog.h @@ -20,8 +20,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_UPDATERSETTINGSDIALOG_H -#define DENG_CLIENT_UPDATERSETTINGSDIALOG_H +#ifndef DE_CLIENT_UPDATERSETTINGSDIALOG_H +#define DE_CLIENT_UPDATERSETTINGSDIALOG_H #include @@ -53,7 +53,7 @@ public slots: void finish(int result); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_CLIENT_UPDATERSETTINGSDIALOG_H +#endif // DE_CLIENT_UPDATERSETTINGSDIALOG_H diff --git a/doomsday/apps/client/include/windows/dd_winit.h b/doomsday/apps/client/include/windows/dd_winit.h index 5ebd9e5db4..aab874bb07 100644 --- a/doomsday/apps/client/include/windows/dd_winit.h +++ b/doomsday/apps/client/include/windows/dd_winit.h @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef LIBDENG_WINIT_H -#define LIBDENG_WINIT_H +#ifndef DE_WINIT_H +#define DE_WINIT_H #define WIN32_LEAN_AND_MEAN @@ -38,4 +38,4 @@ char const *DD_Win32_GetLastErrorMessage(void); } // extern "C" #endif -#endif /* LIBDENG_WINIT_H */ +#endif /* DE_WINIT_H */ diff --git a/doomsday/apps/client/include/windows/directinput.h b/doomsday/apps/client/include/windows/directinput.h index d522ca22de..673c43754b 100644 --- a/doomsday/apps/client/include/windows/directinput.h +++ b/doomsday/apps/client/include/windows/directinput.h @@ -1,5 +1,5 @@ -#ifndef LIBDENG_DIRECTINPUT_H -#define LIBDENG_DIRECTINPUT_H +#ifndef DE_DIRECTINPUT_H +#define DE_DIRECTINPUT_H #ifdef __CLIENT__ @@ -128,4 +128,4 @@ struct DIPropRange : DIPROPRANGE #endif // __CLIENT__ -#endif // LIBDENG_DIRECTINPUT_H +#endif // DE_DIRECTINPUT_H diff --git a/doomsday/apps/client/include/windows/mouse_win32.h b/doomsday/apps/client/include/windows/mouse_win32.h index 38b43dea63..21e1a8fc0f 100644 --- a/doomsday/apps/client/include/windows/mouse_win32.h +++ b/doomsday/apps/client/include/windows/mouse_win32.h @@ -21,8 +21,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_MOUSE_WIN32_H -#define LIBDENG_MOUSE_WIN32_H +#ifndef DE_MOUSE_WIN32_H +#define DE_MOUSE_WIN32_H #include "ui/sys_input.h" @@ -36,4 +36,4 @@ extern mouseinterface_t win32Mouse; } // extern "C" #endif -#endif // LIBDENG_MOUSE_WIN32_H +#endif // DE_MOUSE_WIN32_H diff --git a/doomsday/apps/client/include/world/audioenvironment.h b/doomsday/apps/client/include/world/audioenvironment.h index 7533f223bf..26e934ec0f 100644 --- a/doomsday/apps/client/include/world/audioenvironment.h +++ b/doomsday/apps/client/include/world/audioenvironment.h @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef DENG_CLIENT_WORLD_AUDIOENVIRONMENT_H_ -#define DENG_CLIENT_WORLD_AUDIOENVIRONMENT_H_ +#ifndef DE_CLIENT_WORLD_AUDIOENVIRONMENT_H_ +#define DE_CLIENT_WORLD_AUDIOENVIRONMENT_H_ namespace world { @@ -40,4 +40,4 @@ class AudioEnvironment } // namespace world -#endif // DENG_CLIENT_WORLD_AUDIOENVIRONMENT_H_ +#endif // DE_CLIENT_WORLD_AUDIOENVIRONMENT_H_ diff --git a/doomsday/apps/client/include/world/bindings_world.h b/doomsday/apps/client/include/world/bindings_world.h index 20d8fffaa6..42f9a0d802 100644 --- a/doomsday/apps/client/include/world/bindings_world.h +++ b/doomsday/apps/client/include/world/bindings_world.h @@ -1,7 +1,7 @@ /** @file bindings_world.h * @ingroup world * - * @authors Copyright © 2015-2017 Jaakko Keränen + * @authors Copyright � 2015-2017 Jaakko Ker�nen * * @par License * GPL: http://www.gnu.org/licenses/gpl.html @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_CLIENT_WORLD_BINDINGS_H -#define DENG_CLIENT_WORLD_BINDINGS_H +#ifndef DE_CLIENT_WORLD_BINDINGS_H +#define DE_CLIENT_WORLD_BINDINGS_H #include @@ -28,5 +28,4 @@ void initBindings(de::Binder &binder, de::Record &worldModule); } // namespace world -#endif // DENG_CLIENT_WORLD_BINDINGS_H - +#endif // DE_CLIENT_WORLD_BINDINGS_H diff --git a/doomsday/apps/client/include/world/blockmap.h b/doomsday/apps/client/include/world/blockmap.h index d1ad9e9cce..4be4701d4c 100644 --- a/doomsday/apps/client/include/world/blockmap.h +++ b/doomsday/apps/client/include/world/blockmap.h @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_BLOCKMAP_H -#define DENG_WORLD_BLOCKMAP_H +#ifndef DE_WORLD_BLOCKMAP_H +#define DE_WORLD_BLOCKMAP_H #include #include @@ -185,7 +185,7 @@ class Blockmap void drawDebugVisual() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; typedef Blockmap::Cell BlockmapCell; @@ -193,4 +193,4 @@ typedef Blockmap::CellBlock BlockmapCellBlock; } // namespace world -#endif // DENG_WORLD_BLOCKMAP_H +#endif // DE_WORLD_BLOCKMAP_H diff --git a/doomsday/apps/client/include/world/bsp/convexsubspaceproxy.h b/doomsday/apps/client/include/world/bsp/convexsubspaceproxy.h index da8a9376c9..fbe4933868 100644 --- a/doomsday/apps/client/include/world/bsp/convexsubspaceproxy.h +++ b/doomsday/apps/client/include/world/bsp/convexsubspaceproxy.h @@ -17,8 +17,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_BSP_CONVEXSUBSPACEPROXY_H -#define DENG_WORLD_BSP_CONVEXSUBSPACEPROXY_H +#ifndef DE_WORLD_BSP_CONVEXSUBSPACEPROXY_H +#define DE_WORLD_BSP_CONVEXSUBSPACEPROXY_H #include #include @@ -47,7 +47,7 @@ struct OrderedSegment && de::fequal(toAngle , other.toAngle); } -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG void debugPrint() const { LOGDEV_MAP_MSG("%p Angle: %1.6f %s -> Angle: %1.6f %s") @@ -196,10 +196,10 @@ class ConvexSubspaceProxy OrderedSegments const &segments() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace bsp } // namespace world -#endif // DENG_WORLD_BSP_CONVEXSUBSPACEPROXY_H +#endif // DE_WORLD_BSP_CONVEXSUBSPACEPROXY_H diff --git a/doomsday/apps/client/include/world/bsp/edgetip.h b/doomsday/apps/client/include/world/bsp/edgetip.h index c26f3fe081..7295cc56f5 100644 --- a/doomsday/apps/client/include/world/bsp/edgetip.h +++ b/doomsday/apps/client/include/world/bsp/edgetip.h @@ -23,8 +23,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_BSP_EDGETIP_H -#define DENG_WORLD_BSP_EDGETIP_H +#ifndef DE_WORLD_BSP_EDGETIP_H +#define DE_WORLD_BSP_EDGETIP_H #include #include "world/bsp/linesegment.h" @@ -67,12 +67,12 @@ class EdgeTip LineSegmentSide &side(Side sid) const { if(sid == Front) { - DENG2_ASSERT(_front != nullptr); + DE_ASSERT(_front != nullptr); return *_front; } else { - DENG2_ASSERT(_back != nullptr); + DE_ASSERT(_back != nullptr); return *_back; } } @@ -219,4 +219,4 @@ class EdgeTips } // namespace bsp } // namespace world -#endif // DENG_WORLD_BSP_EDGETIP_H +#endif // DE_WORLD_BSP_EDGETIP_H diff --git a/doomsday/apps/client/include/world/bsp/hplane.h b/doomsday/apps/client/include/world/bsp/hplane.h index 46aa6d748e..665972f5d7 100644 --- a/doomsday/apps/client/include/world/bsp/hplane.h +++ b/doomsday/apps/client/include/world/bsp/hplane.h @@ -23,8 +23,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_BSP_HPLANE_H -#define DENG_WORLD_BSP_HPLANE_H +#ifndef DE_WORLD_BSP_HPLANE_H +#define DE_WORLD_BSP_HPLANE_H #include #include @@ -113,7 +113,7 @@ class HPlane LineSegmentSide *beforeLineSegment() const; LineSegmentSide *afterLineSegment () const; -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG void debugPrint() const; #endif @@ -205,7 +205,7 @@ class HPlane */ void clearIntercepts(); -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG void printIntercepts() const; #endif @@ -294,7 +294,7 @@ class HPlane inline de::dint interceptCount() const { return intercepts().count(); } private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; typedef HPlane::Intercept HPlaneIntercept; @@ -302,4 +302,4 @@ typedef HPlane::Intercept HPlaneIntercept; } // namespace bsp } // namespace world -#endif // DENG_WORLD_BSP_HPLANE_H +#endif // DE_WORLD_BSP_HPLANE_H diff --git a/doomsday/apps/client/include/world/bsp/linesegment.h b/doomsday/apps/client/include/world/bsp/linesegment.h index 2a23d7043b..f09e4d5143 100644 --- a/doomsday/apps/client/include/world/bsp/linesegment.h +++ b/doomsday/apps/client/include/world/bsp/linesegment.h @@ -23,8 +23,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_BSP_LINESEGMENT_H -#define DENG_WORLD_BSP_LINESEGMENT_H +#ifndef DE_WORLD_BSP_LINESEGMENT_H +#define DE_WORLD_BSP_LINESEGMENT_H #include #include @@ -67,12 +67,12 @@ LineRelationship lineRelationship(coord_t fromDist, coord_t toDist); */ class LineSegment { - DENG2_NO_COPY(LineSegment) - DENG2_NO_ASSIGN(LineSegment) + DE_NO_COPY(LineSegment) + DE_NO_ASSIGN(LineSegment) public: /// Required sector attribution is missing. @ingroup errors - DENG2_ERROR(MissingSectorError); + DE_ERROR(MissingSectorError); /// Logical side identifiers: enum { Front, Back }; @@ -88,18 +88,18 @@ class LineSegment */ class Side { - DENG2_NO_COPY(Side) - DENG2_NO_ASSIGN(Side) + DE_NO_COPY(Side) + DE_NO_ASSIGN(Side) public: /// Required neighbor segment is missing. @ingroup errors - DENG2_ERROR(MissingNeighborError); + DE_ERROR(MissingNeighborError); /// Required map line side attribution is missing. @ingroup errors - DENG2_ERROR(MissingMapSideError); + DE_ERROR(MissingMapSideError); /// Required half-edge is missing. @ingroup errors - DENG2_ERROR(MissingHEdgeError); + DE_ERROR(MissingHEdgeError); public: Side(LineSegment &line); @@ -464,7 +464,7 @@ class LineSegment void updateCache(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; public: @@ -553,7 +553,7 @@ class LineSegment inline void replaceTo (Vertex &newVertex) { replaceVertex(To , newVertex); } private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; typedef LineSegment::Side LineSegmentSide; @@ -561,4 +561,4 @@ typedef LineSegment::Side LineSegmentSide; } // namespace bsp } // namespace world -#endif // DENG_WORLD_BSP_LINESEGMENT_H +#endif // DE_WORLD_BSP_LINESEGMENT_H diff --git a/doomsday/apps/client/include/world/bsp/partitioner.h b/doomsday/apps/client/include/world/bsp/partitioner.h index 90ee90ed90..7579e77720 100644 --- a/doomsday/apps/client/include/world/bsp/partitioner.h +++ b/doomsday/apps/client/include/world/bsp/partitioner.h @@ -20,8 +20,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_BSP_PARTITIONER_H -#define DENG_WORLD_BSP_PARTITIONER_H +#ifndef DE_WORLD_BSP_PARTITIONER_H +#define DE_WORLD_BSP_PARTITIONER_H #include #include @@ -55,7 +55,7 @@ class Partitioner { public: /// Notified when an unclosed sector is first found. - DENG2_DEFINE_AUDIENCE(UnclosedSectorFound, void unclosedSectorFound(Sector §or, de::Vec2d const &nearPoint)) + DE_DEFINE_AUDIENCE(UnclosedSectorFound, void unclosedSectorFound(Sector §or, de::Vec2d const &nearPoint)) public: /** @@ -103,10 +103,10 @@ class Partitioner de::dint vertexCount(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace bsp } // namespace world -#endif // DENG_WORLD_BSP_PARTITIONER_H +#endif // DE_WORLD_BSP_PARTITIONER_H diff --git a/doomsday/apps/client/include/world/bsp/partitionevaluator.h b/doomsday/apps/client/include/world/bsp/partitionevaluator.h index 4b11ef7337..a2364a9f0e 100644 --- a/doomsday/apps/client/include/world/bsp/partitionevaluator.h +++ b/doomsday/apps/client/include/world/bsp/partitionevaluator.h @@ -17,8 +17,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_BSP_PARTITIONEVALUATOR_H -#define DENG_WORLD_BSP_PARTITIONEVALUATOR_H +#ifndef DE_WORLD_BSP_PARTITIONEVALUATOR_H +#define DE_WORLD_BSP_PARTITIONEVALUATOR_H #include "world/bsp/superblockmap.h" @@ -48,10 +48,10 @@ class PartitionEvaluator LineSegmentSide *choose(LineSegmentBlockTreeNode &node); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace bsp } // namespace world -#endif // DENG_WORLD_BSP_PARTITIONEVALUATOR_H +#endif // DE_WORLD_BSP_PARTITIONEVALUATOR_H diff --git a/doomsday/apps/client/include/world/bsp/superblockmap.h b/doomsday/apps/client/include/world/bsp/superblockmap.h index d16bad6217..47f7e21155 100644 --- a/doomsday/apps/client/include/world/bsp/superblockmap.h +++ b/doomsday/apps/client/include/world/bsp/superblockmap.h @@ -23,8 +23,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_BSP_LINESEGMENTBLOCK_H -#define DENG_WORLD_BSP_LINESEGMENTBLOCK_H +#ifndef DE_WORLD_BSP_LINESEGMENTBLOCK_H +#define DE_WORLD_BSP_LINESEGMENTBLOCK_H #include #include @@ -83,7 +83,7 @@ class LineSegmentBlock All const &all() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; struct LineSegmentBlockTreeNode : public de::BinaryTree @@ -101,4 +101,4 @@ struct LineSegmentBlockTreeNode : public de::BinaryTree } // namespace bsp } // namespace world -#endif // DENG_WORLD_BSP_LINESEGMENTBLOCK_H +#endif // DE_WORLD_BSP_LINESEGMENTBLOCK_H diff --git a/doomsday/apps/client/include/world/bspleaf.h b/doomsday/apps/client/include/world/bspleaf.h index bd64e1f555..4951fc0e2f 100644 --- a/doomsday/apps/client/include/world/bspleaf.h +++ b/doomsday/apps/client/include/world/bspleaf.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_BSPLEAF_H -#define DENG_WORLD_BSPLEAF_H +#ifndef DE_WORLD_BSPLEAF_H +#define DE_WORLD_BSPLEAF_H #include #include @@ -46,7 +46,7 @@ class BspLeaf : public BspElement { public: /// Required subspace is missing. @ingroup errors - DENG2_ERROR(MissingSubspaceError); + DE_ERROR(MissingSubspaceError); public: /** @@ -102,4 +102,4 @@ class BspLeaf : public BspElement } // namespace world -#endif // DENG_WORLD_BSPLEAF_H +#endif // DE_WORLD_BSPLEAF_H diff --git a/doomsday/apps/client/include/world/clientmobjthinkerdata.h b/doomsday/apps/client/include/world/clientmobjthinkerdata.h index 38c4eb90c5..25c394d788 100644 --- a/doomsday/apps/client/include/world/clientmobjthinkerdata.h +++ b/doomsday/apps/client/include/world/clientmobjthinkerdata.h @@ -16,8 +16,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_WORLD_CLIENTMOBJTHINKERDATA_H -#define DENG_WORLD_CLIENTMOBJTHINKERDATA_H +#ifndef DE_WORLD_CLIENTMOBJTHINKERDATA_H +#define DE_WORLD_CLIENTMOBJTHINKERDATA_H #include #include @@ -115,7 +115,7 @@ class ClientMobjThinkerData : public MobjThinkerData void operator >> (de::Writer &to) const override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_WORLD_CLIENTMOBJTHINKERDATA_H +#endif // DE_WORLD_CLIENTMOBJTHINKERDATA_H diff --git a/doomsday/apps/client/include/world/clientserverworld.h b/doomsday/apps/client/include/world/clientserverworld.h index 30559b1861..f0f0a5dacd 100644 --- a/doomsday/apps/client/include/world/clientserverworld.h +++ b/doomsday/apps/client/include/world/clientserverworld.h @@ -52,14 +52,14 @@ class ClientServerWorld : public World { public: /// No map is currently loaded. @ingroup errors - DENG2_ERROR(MapError); + DE_ERROR(MapError); #ifdef __CLIENT__ /// Notified when a new frame begins. - DENG2_DEFINE_AUDIENCE2(FrameBegin, void worldSystemFrameBegins(bool resetNextViewer)) + DE_DEFINE_AUDIENCE2(FrameBegin, void worldSystemFrameBegins(bool resetNextViewer)) /// Notified when the "current" frame ends. - DENG2_DEFINE_AUDIENCE2(FrameEnd, void worldSystemFrameEnds()) + DE_DEFINE_AUDIENCE2(FrameEnd, void worldSystemFrameEnds()) #endif public: @@ -166,10 +166,10 @@ class ClientServerWorld : public World static mobj_t &contextMobj(const de::Context &); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -DENG_EXTERN_C dd_bool ddMapSetup; -DENG_EXTERN_C int validCount; +DE_EXTERN_C dd_bool ddMapSetup; +DE_EXTERN_C int validCount; #endif // WORLDSYSTEM_H diff --git a/doomsday/apps/client/include/world/contact.h b/doomsday/apps/client/include/world/contact.h index 0f1e63f612..6ddf02c623 100644 --- a/doomsday/apps/client/include/world/contact.h +++ b/doomsday/apps/client/include/world/contact.h @@ -18,8 +18,8 @@ */ #ifdef __CLIENT__ -#ifndef DENG_CLIENT_WORLD_CONTACT_H -#define DENG_CLIENT_WORLD_CONTACT_H +#ifndef DE_CLIENT_WORLD_CONTACT_H +#define DE_CLIENT_WORLD_CONTACT_H #include #include @@ -57,7 +57,7 @@ struct Contact template ObjectType &objectAs() const { - DENG2_ASSERT(_object); + DE_ASSERT(_object); return *static_cast(_object); } @@ -157,5 +157,5 @@ de::LoopResult R_ForAllSubspaceLumContacts(ConvexSubspace &subspace, std::functi } // namespace world -#endif // DENG_CLIENT_WORLD_CONTACT_H +#endif // DE_CLIENT_WORLD_CONTACT_H #endif // __CLIENT__ diff --git a/doomsday/apps/client/include/world/contactspreader.h b/doomsday/apps/client/include/world/contactspreader.h index f2a30498d5..3408a3bfe2 100644 --- a/doomsday/apps/client/include/world/contactspreader.h +++ b/doomsday/apps/client/include/world/contactspreader.h @@ -19,8 +19,8 @@ */ #ifdef __CLIENT__ -#ifndef DENG_CLIENT_WORLD_CONTACTSPREADER_H -#define DENG_CLIENT_WORLD_CONTACTSPREADER_H +#ifndef DE_CLIENT_WORLD_CONTACTSPREADER_H +#define DE_CLIENT_WORLD_CONTACTSPREADER_H #include #include @@ -35,5 +35,5 @@ void spreadContacts(Blockmap const &blockmap, AABoxd const ®ion, QBitArray *s } // namespace world -#endif // DENG_CLIENT_WORLD_CONTACTSPREADER_H +#endif // DE_CLIENT_WORLD_CONTACTSPREADER_H #endif // __CLIENT__ diff --git a/doomsday/apps/client/include/world/convexsubspace.h b/doomsday/apps/client/include/world/convexsubspace.h index a088644675..0df61bbc0d 100644 --- a/doomsday/apps/client/include/world/convexsubspace.h +++ b/doomsday/apps/client/include/world/convexsubspace.h @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_CONVEXSUBSPACE_H -#define DENG_WORLD_CONVEXSUBSPACE_H +#ifndef DE_WORLD_CONVEXSUBSPACE_H +#define DE_WORLD_CONVEXSUBSPACE_H #include #include @@ -51,13 +51,13 @@ class ConvexSubspace : public MapElement { public: /// An invalid polygon was specified. @ingroup errors - DENG2_ERROR(InvalidPolyError); + DE_ERROR(InvalidPolyError); /// Required BspLeaf attribution is missing. @ingroup errors - //DENG2_ERROR(MissingBspLeafError); + //DE_ERROR(MissingBspLeafError); /// Required subsector attribution is missing. @ingroup errors - DENG2_ERROR(MissingSubsectorError); + DE_ERROR(MissingSubsectorError); public: @@ -116,7 +116,7 @@ class ConvexSubspace : public MapElement * @see hasSubsector() */ inline Subsector &subsector() const { - DENG2_ASSERT(_subsector != nullptr); + DE_ASSERT(_subsector != nullptr); return *_subsector; } @@ -145,7 +145,7 @@ class ConvexSubspace : public MapElement * Returns the BspLeaf to which the subspace is assigned. */ inline BspLeaf &bspLeaf() const { - DENG2_ASSERT(_bspLeaf != nullptr); + DE_ASSERT(_bspLeaf != nullptr); return *_bspLeaf; // @throw MissingBspLeafError Attempted with no BspLeaf attributed. //throw MissingBspLeafError("ConvexSubspace::bspLeaf", "No BSP leaf is attributed"); @@ -302,7 +302,7 @@ class ConvexSubspace : public MapElement private: ConvexSubspace(de::Face &convexPolygon, BspLeaf *bspLeaf = nullptr); - DENG2_PRIVATE(d) + DE_PRIVATE(d) // Heavily used; visible for inline access: Subsector *_subsector = nullptr; ///< Attributed subsector (if any, not owned). @@ -311,4 +311,4 @@ class ConvexSubspace : public MapElement } // namespace world -#endif // DENG_WORLD_CONVEXSUBSPACE_H +#endif // DE_WORLD_CONVEXSUBSPACE_H diff --git a/doomsday/apps/client/include/world/impulseaccumulator.h b/doomsday/apps/client/include/world/impulseaccumulator.h index 0bf62524e8..b22b95382a 100644 --- a/doomsday/apps/client/include/world/impulseaccumulator.h +++ b/doomsday/apps/client/include/world/impulseaccumulator.h @@ -83,7 +83,7 @@ class ImpulseAccumulator #endif private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // CLIENT_PLAY_IMPULSEACCUMULATOR_H diff --git a/doomsday/apps/client/include/world/interceptor.h b/doomsday/apps/client/include/world/interceptor.h index 8adacdfe8a..1e18436fe4 100644 --- a/doomsday/apps/client/include/world/interceptor.h +++ b/doomsday/apps/client/include/world/interceptor.h @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_WORLD_MAP_INTERCEPTOR_H -#define DENG_WORLD_MAP_INTERCEPTOR_H +#ifndef DE_WORLD_MAP_INTERCEPTOR_H +#define DE_WORLD_MAP_INTERCEPTOR_H #include "world/map.h" #include "Line" @@ -83,7 +83,7 @@ class Interceptor de::dint trace(world::Map const &map); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_WORLD_MAP_INTERCEPTOR_H +#endif // DE_WORLD_MAP_INTERCEPTOR_H diff --git a/doomsday/apps/client/include/world/line.h b/doomsday/apps/client/include/world/line.h index ef8dc70e9c..91bc2ff985 100644 --- a/doomsday/apps/client/include/world/line.h +++ b/doomsday/apps/client/include/world/line.h @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_LINE_H -#define DENG_WORLD_LINE_H +#ifndef DE_WORLD_LINE_H +#define DE_WORLD_LINE_H #include #include @@ -63,18 +63,18 @@ struct shadowcorner_t; */ class Line : public world::MapElement { - DENG2_NO_COPY (Line) - DENG2_NO_ASSIGN(Line) + DE_NO_COPY (Line) + DE_NO_ASSIGN(Line) public: /// The given side section identifier is invalid. @ingroup errors - DENG2_ERROR(InvalidSectionIdError); + DE_ERROR(InvalidSectionIdError); /// Required polyobj attribution is missing. @ingroup errors - DENG2_ERROR(MissingPolyobjError); + DE_ERROR(MissingPolyobjError); /// Notified whenever the flags change. - DENG2_DEFINE_AUDIENCE(FlagsChange, void lineFlagsChanged(Line &line, de::dint oldFlags)) + DE_DEFINE_AUDIENCE(FlagsChange, void lineFlagsChanged(Line &line, de::dint oldFlags)) // Logical edge identifiers: enum { From, To }; @@ -93,12 +93,12 @@ class Line : public world::MapElement */ class Side : public world::MapElement { - DENG2_NO_COPY (Side) - DENG2_NO_ASSIGN(Side) + DE_NO_COPY (Side) + DE_NO_ASSIGN(Side) public: /// Required sector attribution is missing. @ingroup errors - //DENG2_ERROR(MissingSectorError); + //DE_ERROR(MissingSectorError); // Section identifiers: enum { @@ -126,8 +126,8 @@ class Line : public world::MapElement */ class Segment : public world::MapElement { - DENG2_NO_COPY (Segment) - DENG2_NO_ASSIGN(Segment) + DE_NO_COPY (Segment) + DE_NO_ASSIGN(Segment) public: /** @@ -195,7 +195,7 @@ class Line : public world::MapElement #endif // __CLIENT__ private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; public: @@ -282,7 +282,7 @@ class Line : public world::MapElement * @see hasSector(), sectorPtr() */ inline Sector §or() const { - DENG2_ASSERT(_sector != nullptr); + DE_ASSERT(_sector != nullptr); return *_sector; } @@ -521,7 +521,7 @@ class Line : public world::MapElement de::dint setProperty(world::DmuArgs const &args); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) // Heavily used; visible for inline access: Sector *_sector; @@ -828,7 +828,7 @@ class Line : public world::MapElement static void consoleRegister(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; typedef Line::Side LineSide; @@ -836,4 +836,4 @@ typedef Line::Side::Segment LineSideSegment; Q_DECLARE_OPERATORS_FOR_FLAGS(Line::Side::SectionFlags) -#endif // DENG_WORLD_LINE_H +#endif // DE_WORLD_LINE_H diff --git a/doomsday/apps/client/include/world/lineblockmap.h b/doomsday/apps/client/include/world/lineblockmap.h index 24d0ed389d..201f186792 100644 --- a/doomsday/apps/client/include/world/lineblockmap.h +++ b/doomsday/apps/client/include/world/lineblockmap.h @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_LINEBLOCKMAP_H -#define DENG_WORLD_LINEBLOCKMAP_H +#ifndef DE_WORLD_LINEBLOCKMAP_H +#define DE_WORLD_LINEBLOCKMAP_H #include "world/blockmap.h" #include "Line" @@ -50,4 +50,4 @@ class LineBlockmap : public Blockmap } // namespace world -#endif // DENG_WORLD_LINEBLOCKMAP_H +#endif // DE_WORLD_LINEBLOCKMAP_H diff --git a/doomsday/apps/client/include/world/lineowner.h b/doomsday/apps/client/include/world/lineowner.h index 34bb50c0e6..f7c78c47e9 100644 --- a/doomsday/apps/client/include/world/lineowner.h +++ b/doomsday/apps/client/include/world/lineowner.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_LINEOWNER_H -#define DENG_WORLD_LINEOWNER_H +#ifndef DE_WORLD_LINEOWNER_H +#define DE_WORLD_LINEOWNER_H #include @@ -126,4 +126,4 @@ class LineOwner de::Vec2d const &extendedShadowOffset() const { return _shadowOffsets.extended; } }; -#endif // DENG_WORLD_LINEOWNER_H +#endif // DE_WORLD_LINEOWNER_H diff --git a/doomsday/apps/client/include/world/linesighttest.h b/doomsday/apps/client/include/world/linesighttest.h index b204637d2b..7806871b3c 100644 --- a/doomsday/apps/client/include/world/linesighttest.h +++ b/doomsday/apps/client/include/world/linesighttest.h @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_LINESIGHTTEST_H -#define DENG_WORLD_LINESIGHTTEST_H +#ifndef DE_WORLD_LINESIGHTTEST_H +#define DE_WORLD_LINESIGHTTEST_H #include #include @@ -66,9 +66,9 @@ class LineSightTest bool trace(BspTree const &bspRoot); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace world -#endif // DENG_WORLD_LINESIGHTTEST_H +#endif // DE_WORLD_LINESIGHTTEST_H diff --git a/doomsday/apps/client/include/world/map.h b/doomsday/apps/client/include/world/map.h index 723de2dc4c..9434b8daeb 100644 --- a/doomsday/apps/client/include/world/map.h +++ b/doomsday/apps/client/include/world/map.h @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_MAP_H -#define DENG_WORLD_MAP_H +#ifndef DE_WORLD_MAP_H +#define DE_WORLD_MAP_H #include #include @@ -86,41 +86,44 @@ class ClSkyPlane; */ class Map : public world::BaseMap #ifdef __CLIENT__ -, DENG2_OBSERVES(ClientServerWorld, FrameBegin) +, DE_OBSERVES(ClientServerWorld, FrameBegin) #endif { - DENG2_NO_COPY (Map) - DENG2_NO_ASSIGN(Map) + DE_NO_COPY (Map) + DE_NO_ASSIGN(Map) public: /// Base error for runtime map editing errors. @ingroup errors - DENG2_ERROR(EditError); + DE_ERROR(EditError); /// Required map element is missing. @ingroup errors - DENG2_ERROR(MissingElementError); + DE_ERROR(MissingElementError); + + /// Required map object is missing. @ingroup errors + DE_ERROR(MissingObjectError); /// Required blockmap is missing. @ingroup errors - DENG2_ERROR(MissingBlockmapError); + DE_ERROR(MissingBlockmapError); /// Required BSP data is missing. @ingroup errors - DENG2_ERROR(MissingBspTreeError); + DE_ERROR(MissingBspTreeError); /// Required thinker lists are missing. @ingroup errors - DENG2_ERROR(MissingThinkersError); + DE_ERROR(MissingThinkersError); #ifdef __CLIENT__ /// Required light grid is missing. @ingroup errors - DENG2_ERROR(MissingLightGridError); + DE_ERROR(MissingLightGridError); /// Attempted to add a new element/object when full. @ingroup errors - DENG2_ERROR(FullError); + DE_ERROR(FullError); #endif /// Notified when a one-way window construct is first found. - DENG2_DEFINE_AUDIENCE(OneWayWindowFound, void oneWayWindowFound(Line &line, Sector &backFacingSector)) + DE_DEFINE_AUDIENCE(OneWayWindowFound, void oneWayWindowFound(Line &line, Sector &backFacingSector)) /// Notified when an unclosed sector is first found. - DENG2_DEFINE_AUDIENCE(UnclosedSectorFound, void unclosedSectorFound(Sector §or, de::Vec2d const &nearPoint)) + DE_DEFINE_AUDIENCE(UnclosedSectorFound, void unclosedSectorFound(Sector §or, de::Vec2d const &nearPoint)) /* * Constants: @@ -540,7 +543,7 @@ class Map : public world::BaseMap de::LoopResult forAllSectorsTouchingMobj(struct mobj_s &mob, std::function callback) const; /// Thrown when the referenced subsector is missing/unknown. - DENG2_ERROR(MissingSubsectorError); + DE_ERROR(MissingSubsectorError); /** * Lookup a Subsector in the map by it's unique identifier @a id. @@ -970,9 +973,9 @@ class Map : public world::BaseMap void initMapOutlinePacket(de::shell::MapOutlinePacket &packet); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace world -#endif // DENG_WORLD_MAP_H +#endif // DE_WORLD_MAP_H diff --git a/doomsday/apps/client/include/world/mapobject.h b/doomsday/apps/client/include/world/mapobject.h index 6d9de8e110..e9066e385e 100644 --- a/doomsday/apps/client/include/world/mapobject.h +++ b/doomsday/apps/client/include/world/mapobject.h @@ -18,8 +18,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_WORLD_MAPOBJECT_H -#define DENG_WORLD_MAPOBJECT_H +#ifndef DE_WORLD_MAPOBJECT_H +#define DE_WORLD_MAPOBJECT_H #include #include @@ -40,12 +40,12 @@ class Map; */ class MapObject { - DENG2_NO_COPY (MapObject) - DENG2_NO_ASSIGN(MapObject) + DE_NO_COPY (MapObject) + DE_NO_ASSIGN(MapObject) public: /// No map is attributed. @ingroup errors - DENG2_ERROR(MissingMapError); + DE_ERROR(MissingMapError); /// Special identifier used to mark an invalid index. enum { NoIndex = -1 }; @@ -54,7 +54,7 @@ class MapObject MapObject(de::Vec3d const &origin = de::Vec3d()); virtual ~MapObject(); - DENG2_CAST_METHODS() + DE_CAST_METHODS() /** * Returns the map BSP leaf at the origin of the object (result cached). @@ -134,9 +134,9 @@ class MapObject void setIndexInMap(de::dint newIndex = NoIndex); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace world -#endif // DENG_WORLD_MAPOBJECT_H +#endif // DE_WORLD_MAPOBJECT_H diff --git a/doomsday/apps/client/include/world/p_object.h b/doomsday/apps/client/include/world/p_object.h index 89fd0c7e70..6df5e8ab20 100644 --- a/doomsday/apps/client/include/world/p_object.h +++ b/doomsday/apps/client/include/world/p_object.h @@ -61,7 +61,7 @@ class MobjThinker : public ThinkerT #define IS_BLOCK_LINKED(mo) ((mo)->bNext != 0) -DENG_EXTERN_C de::dint useSRVO, useSRVOAngle; +DE_EXTERN_C de::dint useSRVO, useSRVOAngle; void P_InitUnusedMobjList(); diff --git a/doomsday/apps/client/include/world/p_players.h b/doomsday/apps/client/include/world/p_players.h index 60b0bce200..fd88533af7 100644 --- a/doomsday/apps/client/include/world/p_players.h +++ b/doomsday/apps/client/include/world/p_players.h @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_WORLD_P_PLAYERS_H -#define DENG_WORLD_P_PLAYERS_H +#ifndef DE_WORLD_P_PLAYERS_H +#define DE_WORLD_P_PLAYERS_H #include "api_player.h" #include @@ -122,4 +122,4 @@ PlayerImpulse *P_PlayerImpulseByName(de::String const &name); */ void P_ConsoleRegister(); -#endif // DENG_WORLD_P_PLAYERS_H +#endif // DE_WORLD_P_PLAYERS_H diff --git a/doomsday/apps/client/include/world/p_ticker.h b/doomsday/apps/client/include/world/p_ticker.h index 479b2ea922..a46de130d9 100644 --- a/doomsday/apps/client/include/world/p_ticker.h +++ b/doomsday/apps/client/include/world/p_ticker.h @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_WORLD_P_TICKER_H -#define DENG_WORLD_P_TICKER_H +#ifndef DE_WORLD_P_TICKER_H +#define DE_WORLD_P_TICKER_H #include @@ -27,4 +27,4 @@ */ void P_Ticker(timespan_t time); -#endif // DENG_WORLD_P_TICKER_H +#endif // DE_WORLD_P_TICKER_H diff --git a/doomsday/apps/client/include/world/plane.h b/doomsday/apps/client/include/world/plane.h index b017f918b7..e1f44d4014 100644 --- a/doomsday/apps/client/include/world/plane.h +++ b/doomsday/apps/client/include/world/plane.h @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_PLANE_H -#define DENG_WORLD_PLANE_H +#ifndef DE_WORLD_PLANE_H +#define DE_WORLD_PLANE_H #include #include @@ -45,25 +45,25 @@ class ClPlaneMover; */ class Plane : public world::MapElement { - DENG2_NO_COPY (Plane) - DENG2_NO_ASSIGN(Plane) + DE_NO_COPY (Plane) + DE_NO_ASSIGN(Plane) public: #ifdef __CLIENT__ /// No generator is attached. @ingroup errors - DENG2_ERROR(MissingGeneratorError); + DE_ERROR(MissingGeneratorError); #endif /// Notified when the plane is about to be deleted. - DENG2_DEFINE_AUDIENCE2(Deletion, void planeBeingDeleted(Plane const &plane)) + DE_DEFINE_AUDIENCE2(Deletion, void planeBeingDeleted(Plane const &plane)) /// Notified whenever a @em sharp height change occurs. - DENG2_DEFINE_AUDIENCE2(HeightChange, void planeHeightChanged(Plane &plane)) + DE_DEFINE_AUDIENCE2(HeightChange, void planeHeightChanged(Plane &plane)) #ifdef __CLIENT__ /// Notified whenever a @em smoothed height change occurs. - DENG2_DEFINE_AUDIENCE2(HeightSmoothedChange, void planeHeightSmoothedChanged(Plane &plane)) + DE_DEFINE_AUDIENCE2(HeightSmoothedChange, void planeHeightSmoothedChanged(Plane &plane)) #endif @@ -252,7 +252,7 @@ class Plane : public world::MapElement de::dint setProperty(world::DmuArgs const &args); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_WORLD_PLANE_H +#endif // DE_WORLD_PLANE_H diff --git a/doomsday/apps/client/include/world/polyobj.h b/doomsday/apps/client/include/world/polyobj.h index 68cf5a0030..845f9a5596 100644 --- a/doomsday/apps/client/include/world/polyobj.h +++ b/doomsday/apps/client/include/world/polyobj.h @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_POLYOBJ_H -#define DENG_WORLD_POLYOBJ_H +#ifndef DE_WORLD_POLYOBJ_H +#define DE_WORLD_POLYOBJ_H #include "dd_share.h" // SoundEmitter @@ -48,7 +48,7 @@ typedef struct polyobj_s { public: /// The polyobj is not presently linked in the BSP. @ingroup errors - DENG2_ERROR(NotLinkedError); + DE_ERROR(NotLinkedError); static void setCollisionCallback(void (*func) (struct mobj_s *mobj, void *line, void *polyobj)); @@ -256,4 +256,4 @@ typedef struct polyobj_s } Polyobj; -#endif // DENG_WORLD_POLYOBJ_H +#endif // DE_WORLD_POLYOBJ_H diff --git a/doomsday/apps/client/include/world/polyobjdata.h b/doomsday/apps/client/include/world/polyobjdata.h index 9bffb9e3d4..5eee6ace15 100644 --- a/doomsday/apps/client/include/world/polyobjdata.h +++ b/doomsday/apps/client/include/world/polyobjdata.h @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_WORLD_POLYOBJDATA_H -#define DENG_WORLD_POLYOBJDATA_H +#ifndef DE_WORLD_POLYOBJDATA_H +#define DE_WORLD_POLYOBJDATA_H #include #include @@ -73,4 +73,4 @@ class PolyobjData : public Thinker::IData #endif }; -#endif // DENG_WORLD_POLYOBJDATA_H +#endif // DE_WORLD_POLYOBJDATA_H diff --git a/doomsday/apps/client/include/world/reject.h b/doomsday/apps/client/include/world/reject.h index 3ea8a64ac5..55171ef4b9 100644 --- a/doomsday/apps/client/include/world/reject.h +++ b/doomsday/apps/client/include/world/reject.h @@ -20,8 +20,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_REJECT_H -#define DENG_WORLD_REJECT_H +#ifndef DE_WORLD_REJECT_H +#define DE_WORLD_REJECT_H #if 0 // Needs updating class Map; @@ -74,4 +74,4 @@ class Map; byte *BuildRejectForMap(Map const &map); #endif -#endif // DENG_WORLD_REJECT_H +#endif // DE_WORLD_REJECT_H diff --git a/doomsday/apps/client/include/world/sector.h b/doomsday/apps/client/include/world/sector.h index 0145367f40..ac7500ae87 100644 --- a/doomsday/apps/client/include/world/sector.h +++ b/doomsday/apps/client/include/world/sector.h @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_SECTOR_H -#define DENG_WORLD_SECTOR_H +#ifndef DE_WORLD_SECTOR_H +#define DE_WORLD_SECTOR_H #include #include @@ -49,8 +49,8 @@ struct mobj_s; */ class Sector : public world::MapElement { - DENG2_NO_COPY (Sector) - DENG2_NO_ASSIGN(Sector) + DE_NO_COPY (Sector) + DE_NO_ASSIGN(Sector) public: // Plane identifiers: @@ -70,10 +70,10 @@ class Sector : public world::MapElement //- Lighting ---------------------------------------------------------------------------- /// Notified whenever a light level change occurs. - DENG2_DEFINE_AUDIENCE2(LightLevelChange, void sectorLightLevelChanged(Sector §or)) + DE_DEFINE_AUDIENCE2(LightLevelChange, void sectorLightLevelChanged(Sector §or)) /// Notified whenever a light color change occurs. - DENG2_DEFINE_AUDIENCE2(LightColorChange, void sectorLightColorChanged(Sector §or)) + DE_DEFINE_AUDIENCE2(LightColorChange, void sectorLightColorChanged(Sector §or)) /** * Returns the ambient light level in the sector. The LightLevelChange audience is @@ -138,7 +138,7 @@ class Sector : public world::MapElement //- Planes ------------------------------------------------------------------------------ /// Required/referenced plane is missing. @ingroup errors - DENG2_ERROR(MissingPlaneError); + DE_ERROR(MissingPlaneError); /** * Returns @c true if at least one Plane in the sector is sky-masked. @@ -157,13 +157,13 @@ class Sector : public world::MapElement */ inline Plane &plane(de::dint planeIndex) { - DENG2_ASSERT(planeIndex >= 0 && planeIndex < planeCount()); + DE_ASSERT(planeIndex >= 0 && planeIndex < planeCount()); return *_lookupPlanes[planeIndex]; } inline Plane const &plane(de::dint planeIndex) const { - DENG2_ASSERT(planeIndex >= 0 && planeIndex < planeCount()); + DE_ASSERT(planeIndex >= 0 && planeIndex < planeCount()); return *_lookupPlanes[planeIndex]; } @@ -316,9 +316,9 @@ class Sector : public world::MapElement de::dint setProperty(world::DmuArgs const &args); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) Plane **_lookupPlanes; // heavily used; visible for inline access }; -#endif // DENG_WORLD_SECTOR_H +#endif // DE_WORLD_SECTOR_H diff --git a/doomsday/apps/client/include/world/sky.h b/doomsday/apps/client/include/world/sky.h index bd362eaf39..01a8c6a395 100644 --- a/doomsday/apps/client/include/world/sky.h +++ b/doomsday/apps/client/include/world/sky.h @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_SKY_H -#define DENG_WORLD_SKY_H +#ifndef DE_WORLD_SKY_H +#define DE_WORLD_SKY_H #include #include @@ -43,13 +43,13 @@ class Sky : public MapElement { public: /// Notified when the sky is about to be deleted. - DENG2_DEFINE_AUDIENCE2(Deletion, void skyBeingDeleted(Sky const &sky)) + DE_DEFINE_AUDIENCE2(Deletion, void skyBeingDeleted(Sky const &sky)) /// Notified whenever the height changes. - DENG2_DEFINE_AUDIENCE2(HeightChange, void skyHeightChanged(Sky &sky)) + DE_DEFINE_AUDIENCE2(HeightChange, void skyHeightChanged(Sky &sky)) /// Notified whenever the horizon offset changes. - DENG2_DEFINE_AUDIENCE2(HorizonOffsetChange, void skyHorizonOffsetChanged(Sky &sky)) + DE_DEFINE_AUDIENCE2(HorizonOffsetChange, void skyHorizonOffsetChanged(Sky &sky)) explicit Sky(defn::Sky const *definition = nullptr); @@ -108,7 +108,7 @@ class Sky : public MapElement //- Layers ------------------------------------------------------------------------------ /// Thrown when the required/referenced layer is missing. @ingroup errors - DENG2_ERROR(MissingLayerError); + DE_ERROR(MissingLayerError); /** * Multiple layers can be used for parallax effects. @@ -117,13 +117,13 @@ class Sky : public MapElement { public: /// Notified whenever the active-state changes. - DENG2_DEFINE_AUDIENCE2(ActiveChange, void skyLayerActiveChanged(Layer &layer)) + DE_DEFINE_AUDIENCE2(ActiveChange, void skyLayerActiveChanged(Layer &layer)) /// Notified whenever the masked-state changes. - DENG2_DEFINE_AUDIENCE2(MaskedChange, void skyLayerMaskedChanged(Layer &layer)) + DE_DEFINE_AUDIENCE2(MaskedChange, void skyLayerMaskedChanged(Layer &layer)) /// Notified whenever the layer material changes. - DENG2_DEFINE_AUDIENCE2(MaterialChange, void skyLayerMaterialChanged(Layer &layer)) + DE_DEFINE_AUDIENCE2(MaterialChange, void skyLayerMaterialChanged(Layer &layer)) public: /** @@ -205,7 +205,7 @@ class Sky : public MapElement void setFadeoutLimit(de::dfloat newLimit); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; /** @@ -264,11 +264,11 @@ class Sky : public MapElement de::dint setProperty(world::DmuArgs const &args); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; typedef Sky::Layer SkyLayer; } // namespace world -#endif // DENG_WORLD_SKY_H +#endif // DE_WORLD_SKY_H diff --git a/doomsday/apps/client/include/world/subsector.h b/doomsday/apps/client/include/world/subsector.h index e0c1a77e36..747ed77570 100644 --- a/doomsday/apps/client/include/world/subsector.h +++ b/doomsday/apps/client/include/world/subsector.h @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_SUBSECTOR_H -#define DENG_WORLD_SUBSECTOR_H +#ifndef DE_WORLD_SUBSECTOR_H +#define DE_WORLD_SUBSECTOR_H #include #include @@ -47,7 +47,7 @@ class Subsector { public: /// Notified when the subsector is about to be deleted. - DENG2_DEFINE_AUDIENCE(Deletion, void subsectorBeingDeleted(Subsector const &subsector)) + DE_DEFINE_AUDIENCE(Deletion, void subsectorBeingDeleted(Subsector const &subsector)) /** * Construct a new subsector comprised of the specified set of map subspace regions. @@ -60,7 +60,7 @@ class Subsector virtual ~Subsector(); - DENG2_CAST_METHODS() + DE_CAST_METHODS() /** * Returns a humman-friendly, textual description of the subsector. @@ -134,7 +134,7 @@ class Subsector QList listUniqueBoundaryEdges() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; /** @@ -154,7 +154,7 @@ class SubsectorCirculator { public: /// Attempt to dereference a NULL circulator. @ingroup errors - DENG2_ERROR(NullError); + DE_ERROR(NullError); public: /** @@ -251,4 +251,4 @@ class SubsectorCirculator } // namespace world -#endif // DENG_WORLD_SUBSECTOR_H +#endif // DE_WORLD_SUBSECTOR_H diff --git a/doomsday/apps/client/include/world/surface.h b/doomsday/apps/client/include/world/surface.h index c784cd8ff4..47f8598834 100644 --- a/doomsday/apps/client/include/world/surface.h +++ b/doomsday/apps/client/include/world/surface.h @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_SURFACE_H -#define DENG_WORLD_SURFACE_H +#ifndef DE_WORLD_SURFACE_H +#define DE_WORLD_SURFACE_H #include #include @@ -41,8 +41,8 @@ class MaterialAnimator; */ class Surface : public world::MapElement { - DENG2_NO_COPY (Surface) - DENG2_NO_ASSIGN(Surface) + DE_NO_COPY (Surface) + DE_NO_ASSIGN(Surface) public: /// Interface for surface decoration state. @@ -53,16 +53,16 @@ class Surface : public world::MapElement }; /// Notified whenever the tint color changes. - DENG2_DEFINE_AUDIENCE2(ColorChange, void surfaceColorChanged(Surface §or)) + DE_DEFINE_AUDIENCE2(ColorChange, void surfaceColorChanged(Surface §or)) /// Notified whenever the normal vector changes. - DENG2_DEFINE_AUDIENCE2(NormalChange, void surfaceNormalChanged(Surface &surface)) + DE_DEFINE_AUDIENCE2(NormalChange, void surfaceNormalChanged(Surface &surface)) /// Notified whenever the opacity changes. - DENG2_DEFINE_AUDIENCE2(OpacityChange, void surfaceOpacityChanged(Surface &surface)) + DE_DEFINE_AUDIENCE2(OpacityChange, void surfaceOpacityChanged(Surface &surface)) /// Notified whenever the @em sharp origin changes. - DENG2_DEFINE_AUDIENCE2(OriginChange, void surfaceOriginChanged(Surface &surface)) + DE_DEFINE_AUDIENCE2(OriginChange, void surfaceOriginChanged(Surface &surface)) /** * Construct a new surface. @@ -132,10 +132,10 @@ class Surface : public world::MapElement //- Material ---------------------------------------------------------------------------- /// Thrown when a required material is missing. @ingroup errors - DENG2_ERROR(MissingMaterialError); + DE_ERROR(MissingMaterialError); /// Notified when the material changes. - DENG2_DEFINE_AUDIENCE2(MaterialChange, void surfaceMaterialChanged(Surface &surface)) + DE_DEFINE_AUDIENCE2(MaterialChange, void surfaceMaterialChanged(Surface &surface)) /** * Returns @c true iff a material is bound to the surface. @@ -230,7 +230,7 @@ class Surface : public world::MapElement //- Origin smoothing -------------------------------------------------------------------- /// Notified when the @em sharp material origin changes. - DENG2_DEFINE_AUDIENCE2(OriginSmoothedChange, void surfaceOriginSmoothedChanged(Surface &surface)) + DE_DEFINE_AUDIENCE2(OriginSmoothedChange, void surfaceOriginSmoothedChanged(Surface &surface)) /// Maximum speed for a smoothed material offset. static de::dint const MAX_SMOOTH_MATERIAL_MOVE = 8; @@ -291,7 +291,7 @@ class Surface : public world::MapElement private: std::unique_ptr _decorationState; - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; -#endif // DENG_WORLD_SURFACE_H +#endif // DE_WORLD_SURFACE_H diff --git a/doomsday/apps/client/include/world/thinkers.h b/doomsday/apps/client/include/world/thinkers.h index 4ede5b312c..f547308f78 100644 --- a/doomsday/apps/client/include/world/thinkers.h +++ b/doomsday/apps/client/include/world/thinkers.h @@ -120,7 +120,7 @@ class Thinkers de::dint count(de::dint *numInStasis = nullptr) const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace world @@ -141,4 +141,4 @@ world::Map &Thinker_Map(thinker_t const &th); */ void Thinker_InitPrivateData(thinker_t *th, de::Id::Type knownId = 0); -#endif // DENG_WORLD_THINKERS_H +#endif // DE_WORLD_THINKERS_H diff --git a/doomsday/apps/client/include/world/vertex.h b/doomsday/apps/client/include/world/vertex.h index 1ff9830304..1016295b9e 100644 --- a/doomsday/apps/client/include/world/vertex.h +++ b/doomsday/apps/client/include/world/vertex.h @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_VERTEX_H -#define DENG_WORLD_VERTEX_H +#ifndef DE_WORLD_VERTEX_H +#define DE_WORLD_VERTEX_H #include #include @@ -39,12 +39,12 @@ class LineOwner; */ class Vertex : public world::MapElement, public de::MeshElement { - DENG2_NO_COPY (Vertex) - DENG2_NO_ASSIGN(Vertex) + DE_NO_COPY (Vertex) + DE_NO_ASSIGN(Vertex) public: /// Notified whenever the origin changes. - DENG2_DEFINE_AUDIENCE(OriginChange, void vertexOriginChanged(Vertex &vertex)) + DE_DEFINE_AUDIENCE(OriginChange, void vertexOriginChanged(Vertex &vertex)) public: /// @todo Move to the map loader: /// Head of the LineOwner rings (an array of [numLineOwners] size). The @@ -141,4 +141,4 @@ class Vertex : public world::MapElement, public de::MeshElement de::Vec2d _origin; ///< Map-space coordinates. }; -#endif // DENG_WORLD_VERTEX_H +#endif // DE_WORLD_VERTEX_H diff --git a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/dgl/dgl_draw.fsh b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/dgl/dgl_draw.fsh index b6c0d01fcd..a23f3d26c9 100644 --- a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/dgl/dgl_draw.fsh +++ b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/dgl/dgl_draw.fsh @@ -27,9 +27,9 @@ uniform float uAlphaLimit[DGL_BATCH_MAX]; uniform sampler2D uTex0[DGL_BATCH_MAX]; uniform sampler2D uTex1[DGL_BATCH_MAX]; -flat DENG_VAR int vBatchIndex; -DENG_VAR vec4 vColor; -DENG_VAR vec2 vTexCoord[2]; +flat DE_VAR int vBatchIndex; +DE_VAR vec4 vColor; +DE_VAR vec2 vTexCoord[2]; vec4 sampleTexture0(int batchIndex, vec2 uv) { diff --git a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/dgl/dgl_draw.vsh b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/dgl/dgl_draw.vsh index 58ee306fe5..60b8ad9d23 100644 --- a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/dgl/dgl_draw.vsh +++ b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/dgl/dgl_draw.vsh @@ -18,11 +18,11 @@ * http://www.gnu.org/licenses */ -DENG_LAYOUT_LOC(0) DENG_ATTRIB vec4 aVertex; -DENG_LAYOUT_LOC(1) DENG_ATTRIB vec4 aColor; -DENG_LAYOUT_LOC(2) DENG_ATTRIB vec2 aTexCoord[2]; -DENG_LAYOUT_LOC(4) DENG_ATTRIB vec2 aFragOffset; -DENG_LAYOUT_LOC(5) DENG_ATTRIB float aBatchIndex; +DE_LAYOUT_LOC(0) DE_ATTRIB vec4 aVertex; +DE_LAYOUT_LOC(1) DE_ATTRIB vec4 aColor; +DE_LAYOUT_LOC(2) DE_ATTRIB vec2 aTexCoord[2]; +DE_LAYOUT_LOC(4) DENG_ATTRIB vec2 aFragOffset; +DE_LAYOUT_LOC(5) DENG_ATTRIB float aBatchIndex; uniform vec2 uFragmentSize; // used for line width uniform mat4 uMvpMatrix[DGL_BATCH_MAX]; @@ -30,8 +30,8 @@ uniform mat4 uTexMatrix0[DGL_BATCH_MAX]; uniform mat4 uTexMatrix1[DGL_BATCH_MAX]; flat DENG_VAR int vBatchIndex; -DENG_VAR vec4 vColor; -DENG_VAR vec2 vTexCoord[2]; +DE_VAR vec4 vColor; +DE_VAR vec2 vTexCoord[2]; vec2 transformTexCoord(const mat4 matrix, const vec2 tc) { diff --git a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/include/lighting.glsl b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/include/lighting.glsl index ddc29e8d51..780ae5c542 100644 --- a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/include/lighting.glsl +++ b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/include/lighting.glsl @@ -27,20 +27,20 @@ uniform vec4 uLightIntensities[4]; // colored uniform vec3 uLightDirs[4]; // model space uniform vec3 uEyePos; // model space -#ifdef DENG_VERTEX_SHADER +#ifdef DE_VERTEX_SHADER out vec3 vEyeDir; // from vertex, in model space #else in vec3 vEyeDir; #endif -#ifdef DENG_VERTEX_SHADER +#ifdef DE_VERTEX_SHADER void calculateEyeDirection(vec4 vertex) { vEyeDir = uEyePos - vertex.xyz/vertex.w; } -#endif // DENG_VERTEX_SHADER +#endif // DE_VERTEX_SHADER vec3 diffuseLightContrib(int index, vec3 msNormal) { @@ -60,7 +60,7 @@ vec3 diffuseLight(vec3 msNormal) diffuseLightContrib(3, msNormal)); } -#ifdef DENG_HAVE_UTEX +#ifdef DE_HAVE_UTEX vec3 specularLightContrib(vec4 specGloss, int index, vec3 msNormal) { @@ -97,4 +97,4 @@ vec4 emittedLight(vec2 emissiveUV) return emission; } -#endif // DENG_HAVE_UTEX +#endif // DE_HAVE_UTEX diff --git a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/include/reflection.glsl b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/include/reflection.glsl index 9696860aad..e19aada62c 100644 --- a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/include/reflection.glsl +++ b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/include/reflection.glsl @@ -22,7 +22,7 @@ * http://www.gnu.org/licenses */ -#define DENG_HAVE_UREFLECTIONTEX +#define DE_HAVE_UREFLECTIONTEX #define MAX_REFLECTION_BIAS 5.0 diff --git a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/include/tangentspace.glsl b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/include/tangentspace.glsl index 5faf2faf2d..8d346dfed7 100644 --- a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/include/tangentspace.glsl +++ b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/include/tangentspace.glsl @@ -18,7 +18,7 @@ * http://www.gnu.org/licenses */ -#ifdef DENG_VERTEX_SHADER +#ifdef DE_VERTEX_SHADER in vec3 aNormal; in vec3 aTangent; @@ -40,9 +40,9 @@ void setTangentSpace(mat4 modelSpace) vTSBitangent = transformVector(aBitangent, modelSpace); } -#endif // DENG_VERTEX_SHADER +#endif // DE_VERTEX_SHADER -#ifdef DENG_FRAGMENT_SHADER +#ifdef DE_FRAGMENT_SHADER in vec3 vTSNormal; in vec3 vTSTangent; @@ -58,4 +58,4 @@ vec3 modelSpaceNormalVector(vec2 uv) return fragmentTangentSpace() * normalVector(uv); } -#endif // DENG_FRAGMENT_SHADER +#endif // DE_FRAGMENT_SHADER diff --git a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/include/texture.glsl b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/include/texture.glsl index bab34e7351..bec7fc79bb 100644 --- a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/include/texture.glsl +++ b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/include/texture.glsl @@ -18,7 +18,7 @@ * http://www.gnu.org/licenses */ -#define DENG_HAVE_UTEX +#define DE_HAVE_UTEX uniform sampler2D uTex; // texture atlas diff --git a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/ui.dei b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/ui.dei index 0397bd3b04..1bcda4f92e 100644 --- a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/ui.dei +++ b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/ui.dei @@ -3,9 +3,9 @@ ui { shader guiwidget.batch { vertex = " uniform mat4 uMvpMatrix; - uniform vec4 uColor[DENG_MAX_BATCH_UNIFORMS]; - uniform float uSaturation[DENG_MAX_BATCH_UNIFORMS]; - uniform vec4 uScissorRect[DENG_MAX_BATCH_UNIFORMS]; + uniform vec4 uColor[DE_MAX_BATCH_UNIFORMS]; + uniform float uSaturation[DE_MAX_BATCH_UNIFORMS]; + uniform vec4 uScissorRect[DE_MAX_BATCH_UNIFORMS]; in vec4 aVertex; in vec2 aUV; diff --git a/doomsday/apps/client/src/api_console.cpp b/doomsday/apps/client/src/api_console.cpp index 843687007e..5ff80efe36 100644 --- a/doomsday/apps/client/src/api_console.cpp +++ b/doomsday/apps/client/src/api_console.cpp @@ -16,7 +16,7 @@ * http://www.gnu.org/licenses */ -#define DENG_NO_API_MACROS_CONSOLE +#define DE_NO_API_MACROS_CONSOLE #include #include #include @@ -147,7 +147,7 @@ int DD_Executef(int silent, const char *command, ...) return Con_Execute(CMDS_GAME, buffer, silent, false); } -DENG_DECLARE_API(Con) = +DE_DECLARE_API(Con) = { { DE_API_CONSOLE }, diff --git a/doomsday/apps/client/src/api_filesys.cpp b/doomsday/apps/client/src/api_filesys.cpp index da7556ab08..b66e45272d 100644 --- a/doomsday/apps/client/src/api_filesys.cpp +++ b/doomsday/apps/client/src/api_filesys.cpp @@ -19,14 +19,14 @@ #include #include -#define DENG_NO_API_MACROS_FILESYS +#define DE_NO_API_MACROS_FILESYS #include "api_filesys.h" // m_misc.c -DENG_EXTERN_C size_t M_ReadFile(char const *name, char **buffer); -DENG_EXTERN_C AutoStr* M_ReadFileIntoString(ddstring_t const *path, dd_bool *isCustom); +DE_EXTERN_C size_t M_ReadFile(char const *name, char **buffer); +DE_EXTERN_C AutoStr* M_ReadFileIntoString(ddstring_t const *path, dd_bool *isCustom); -DENG_DECLARE_API(F) = +DE_DECLARE_API(F) = { { DE_API_FILE_SYSTEM }, diff --git a/doomsday/apps/client/src/api_map.cpp b/doomsday/apps/client/src/api_map.cpp index 6334d88696..094f1eb6c5 100644 --- a/doomsday/apps/client/src/api_map.cpp +++ b/doomsday/apps/client/src/api_map.cpp @@ -21,7 +21,7 @@ * 02110-1301 USA */ -#define DENG_NO_API_MACROS_MAP +#define DE_NO_API_MACROS_MAP #include "de_base.h" #include "api_map.h" @@ -132,7 +132,7 @@ static int dummyType(void const *dummy) return DMU_NONE; } - DENG2_ASSERT(dummies.contains(const_cast(elem))); + DE_ASSERT(dummies.contains(const_cast(elem))); return elem->type(); } @@ -187,7 +187,7 @@ void P_FreeDummy(void *dummy) App_FatalError("P_FreeDummy: Dummy is of unknown type."); } - DENG2_ASSERT(dummies.contains(elem)); + DE_ASSERT(dummies.contains(elem)); dummies.remove(elem); delete elem; @@ -230,7 +230,7 @@ int P_ToIndex(void const *ptr) default: /// @todo Throw exception. - DENG2_ASSERT(false); // Unknown/non-indexable DMU type. + DE_ASSERT(false); // Unknown/non-indexable DMU type. return -1; } } @@ -468,11 +468,11 @@ int P_Callbackp(int type, void *elPtr, int (*callback)(void *p, void *ctx), void { return callback(elem, context); } -#ifdef DENG_DEBUG +#ifdef DE_DEBUG else { LOG_DEBUG("Type mismatch %s != %s\n") << DMU_Str(type) << DMU_Str(elem->type()); - DENG2_ASSERT(false); + DE_ASSERT(false); } #endif break; @@ -496,7 +496,7 @@ int P_Callbackp(int type, void *elPtr, int (*callback)(void *p, void *ctx), void */ static void setProperty(MapElement *elem, DmuArgs &args) { - DENG_ASSERT(elem != 0); + DE_ASSERT(elem != 0); /** * @par Algorithm @@ -602,7 +602,7 @@ static void setProperty(MapElement *elem, DmuArgs &args) static void getProperty(MapElement const *elem, DmuArgs &args) { - DENG_ASSERT(elem != 0); + DE_ASSERT(elem != 0); // Dereference where necessary. Note the order, these cascade. if(args.type == DMU_SECTOR) @@ -1389,14 +1389,14 @@ void P_GetPtrpv(void *ptr, uint prop, void *params) } #undef P_MapExists -DENG_EXTERN_C dd_bool P_MapExists(char const *uriCString) +DE_EXTERN_C dd_bool P_MapExists(char const *uriCString) { if(!uriCString || !uriCString[0]) return false; return App_Resources().mapManifests().tryFindMapManifest(de::makeUri(uriCString)) != nullptr; } #undef P_MapIsCustom -DENG_EXTERN_C dd_bool P_MapIsCustom(char const *uriCString) +DE_EXTERN_C dd_bool P_MapIsCustom(char const *uriCString) { if(!uriCString || !uriCString[0]) return false; if(res::MapManifest const *mapDef = App_Resources().mapManifests().tryFindMapManifest(de::makeUri(uriCString))) @@ -1407,7 +1407,7 @@ DENG_EXTERN_C dd_bool P_MapIsCustom(char const *uriCString) } #undef P_MapSourceFile -DENG_EXTERN_C AutoStr *P_MapSourceFile(char const *uriCString) +DE_EXTERN_C AutoStr *P_MapSourceFile(char const *uriCString) { if(!uriCString || !uriCString[0]) return nullptr; if(res::MapManifest const *mapDef = App_Resources().mapManifests().tryFindMapManifest(de::makeUri(uriCString))) @@ -1418,7 +1418,7 @@ DENG_EXTERN_C AutoStr *P_MapSourceFile(char const *uriCString) } #undef P_MapChange -DENG_EXTERN_C dd_bool P_MapChange(char const *uriCString) +DE_EXTERN_C dd_bool P_MapChange(char const *uriCString) { if(!uriCString || !uriCString[0]) { @@ -1449,7 +1449,7 @@ DENG_EXTERN_C dd_bool P_MapChange(char const *uriCString) } #undef P_CountMapObjs -DENG_EXTERN_C uint P_CountMapObjs(int entityId) +DE_EXTERN_C uint P_CountMapObjs(int entityId) { if(!App_World().hasMap()) return 0; EntityDatabase &entities = App_World().map().entityDatabase(); @@ -1457,23 +1457,23 @@ DENG_EXTERN_C uint P_CountMapObjs(int entityId) } #undef Mobj_Link -DENG_EXTERN_C void Mobj_Link(mobj_t *mobj, int flags) +DE_EXTERN_C void Mobj_Link(mobj_t *mobj, int flags) { if(!mobj || !App_World().hasMap()) return; // Huh? App_World().map().link(*mobj, flags); } #undef Mobj_Unlink -DENG_EXTERN_C void Mobj_Unlink(mobj_t *mobj) +DE_EXTERN_C void Mobj_Unlink(mobj_t *mobj) { if(!mobj || !Mobj_IsLinked(*mobj)) return; Mobj_Map(*mobj).unlink(*mobj); } #undef Mobj_TouchedLinesIterator -DENG_EXTERN_C int Mobj_TouchedLinesIterator(mobj_t *mob, int (*callback) (Line *, void *), void *context) +DE_EXTERN_C int Mobj_TouchedLinesIterator(mobj_t *mob, int (*callback) (Line *, void *), void *context) { - DENG2_ASSERT(mob && callback); + DE_ASSERT(mob && callback); LoopResult result = Mobj_Map(*mob).forAllLinesTouchingMobj(*mob, [&callback, &context] (Line &line) { return LoopResult( callback(&line, context) ); @@ -1482,9 +1482,9 @@ DENG_EXTERN_C int Mobj_TouchedLinesIterator(mobj_t *mob, int (*callback) (Line * } #undef Mobj_TouchedSectorsIterator -DENG_EXTERN_C int Mobj_TouchedSectorsIterator(mobj_t *mob, int (*callback) (Sector *, void *), void *context) +DE_EXTERN_C int Mobj_TouchedSectorsIterator(mobj_t *mob, int (*callback) (Sector *, void *), void *context) { - DENG2_ASSERT(mob && callback); + DE_ASSERT(mob && callback); LoopResult result = Mobj_Map(*mob).forAllSectorsTouchingMobj(*mob, [&callback, &context] (Sector §or) { return LoopResult( callback(§or, context) ); @@ -1493,9 +1493,9 @@ DENG_EXTERN_C int Mobj_TouchedSectorsIterator(mobj_t *mob, int (*callback) (Sect } #undef Line_TouchingMobjsIterator -DENG_EXTERN_C int Line_TouchingMobjsIterator(Line *line, int (*callback) (mobj_t *, void *), void *context) +DE_EXTERN_C int Line_TouchingMobjsIterator(Line *line, int (*callback) (mobj_t *, void *), void *context) { - DENG2_ASSERT(line && callback); + DE_ASSERT(line && callback); LoopResult result = line->map().forAllMobjsTouchingLine(*line, [&callback, &context] (mobj_t &mob) { return LoopResult( callback(&mob, context) ); @@ -1504,9 +1504,9 @@ DENG_EXTERN_C int Line_TouchingMobjsIterator(Line *line, int (*callback) (mobj_t } #undef Sector_TouchingMobjsIterator -DENG_EXTERN_C int Sector_TouchingMobjsIterator(Sector *sector, int (*callback) (mobj_t *, void *), void *context) +DE_EXTERN_C int Sector_TouchingMobjsIterator(Sector *sector, int (*callback) (mobj_t *, void *), void *context) { - DENG2_ASSERT(sector && callback); + DE_ASSERT(sector && callback); LoopResult result = sector->map().forAllMobjsTouchingSector(*sector, [&callback, &context] (mobj_t &mob) { return LoopResult( callback(&mob, context) ); @@ -1515,17 +1515,17 @@ DENG_EXTERN_C int Sector_TouchingMobjsIterator(Sector *sector, int (*callback) ( } #undef Sector_AtPoint_FixedPrecision -DENG_EXTERN_C Sector *Sector_AtPoint_FixedPrecision(const_pvec2d_t point) +DE_EXTERN_C Sector *Sector_AtPoint_FixedPrecision(const_pvec2d_t point) { if(!App_World().hasMap()) return 0; return App_World().map().bspLeafAt_FixedPrecision(point).sectorPtr(); } #undef Mobj_BoxIterator -DENG_EXTERN_C int Mobj_BoxIterator(AABoxd const *box, +DE_EXTERN_C int Mobj_BoxIterator(AABoxd const *box, int (*callback) (mobj_t *, void *), void *context) { - DENG2_ASSERT(box && callback); + DE_ASSERT(box && callback); LoopResult result = LoopContinue; if(App_World().hasMap()) @@ -1548,10 +1548,10 @@ DENG_EXTERN_C int Mobj_BoxIterator(AABoxd const *box, } #undef Polyobj_BoxIterator -DENG_EXTERN_C int Polyobj_BoxIterator(AABoxd const *box, +DE_EXTERN_C int Polyobj_BoxIterator(AABoxd const *box, int (*callback) (struct polyobj_s *, void *), void *context) { - DENG2_ASSERT(box && callback); + DE_ASSERT(box && callback); LoopResult result = LoopContinue; if(App_World().hasMap()) @@ -1574,10 +1574,10 @@ DENG_EXTERN_C int Polyobj_BoxIterator(AABoxd const *box, } #undef Line_BoxIterator -DENG_EXTERN_C int Line_BoxIterator(AABoxd const *box, int flags, +DE_EXTERN_C int Line_BoxIterator(AABoxd const *box, int flags, int (*callback) (Line *, void *), void *context) { - DENG2_ASSERT(box && callback); + DE_ASSERT(box && callback); if(!App_World().hasMap()) return LoopContinue; return App_World().map().forAllLinesInBox(*box, flags, [&callback, &context] (Line &line) @@ -1587,10 +1587,10 @@ DENG_EXTERN_C int Line_BoxIterator(AABoxd const *box, int flags, } #undef Subspace_BoxIterator -DENG_EXTERN_C int Subspace_BoxIterator(AABoxd const *box, +DE_EXTERN_C int Subspace_BoxIterator(AABoxd const *box, int (*callback) (struct convexsubspace_s *, void *), void *context) { - DENG2_ASSERT(box && callback); + DE_ASSERT(box && callback); if (!App_World().hasMap()) return LoopContinue; dint const localValidCount = validCount; @@ -1617,7 +1617,7 @@ DENG_EXTERN_C int Subspace_BoxIterator(AABoxd const *box, } #undef P_PathTraverse2 -DENG_EXTERN_C int P_PathTraverse2(const_pvec2d_t from, const_pvec2d_t to, +DE_EXTERN_C int P_PathTraverse2(const_pvec2d_t from, const_pvec2d_t to, int flags, traverser_t callback, void *context) { if(!App_World().hasMap()) return false; // Continue iteration. @@ -1627,7 +1627,7 @@ DENG_EXTERN_C int P_PathTraverse2(const_pvec2d_t from, const_pvec2d_t to, } #undef P_PathTraverse -DENG_EXTERN_C int P_PathTraverse(const_pvec2d_t from, const_pvec2d_t to, +DE_EXTERN_C int P_PathTraverse(const_pvec2d_t from, const_pvec2d_t to, traverser_t callback, void *context) { if(!App_World().hasMap()) return false; // Continue iteration. @@ -1637,7 +1637,7 @@ DENG_EXTERN_C int P_PathTraverse(const_pvec2d_t from, const_pvec2d_t to, } #undef P_CheckLineSight -DENG_EXTERN_C dd_bool P_CheckLineSight(const_pvec3d_t from, const_pvec3d_t to, coord_t bottomSlope, +DE_EXTERN_C dd_bool P_CheckLineSight(const_pvec3d_t from, const_pvec3d_t to, coord_t bottomSlope, coord_t topSlope, int flags) { if(!App_World().hasMap()) return false; // Continue iteration. @@ -1647,80 +1647,80 @@ DENG_EXTERN_C dd_bool P_CheckLineSight(const_pvec3d_t from, const_pvec3d_t to, c } #undef Interceptor_Origin -DENG_EXTERN_C coord_t const *Interceptor_Origin(Interceptor const *trace) +DE_EXTERN_C coord_t const *Interceptor_Origin(Interceptor const *trace) { if(!trace) return 0; return trace->origin(); } #undef Interceptor_Direction -DENG_EXTERN_C coord_t const *(Interceptor_Direction)(Interceptor const *trace) +DE_EXTERN_C coord_t const *(Interceptor_Direction)(Interceptor const *trace) { if(!trace) return 0; return trace->direction(); } #undef Interceptor_Opening -DENG_EXTERN_C LineOpening const *Interceptor_Opening(Interceptor const *trace) +DE_EXTERN_C LineOpening const *Interceptor_Opening(Interceptor const *trace) { if(!trace) return 0; return &trace->opening(); } #undef Interceptor_AdjustOpening -DENG_EXTERN_C dd_bool Interceptor_AdjustOpening(Interceptor *trace, Line *line) +DE_EXTERN_C dd_bool Interceptor_AdjustOpening(Interceptor *trace, Line *line) { if(!trace) return false; return trace->adjustOpening(line); } #undef Mobj_CreateXYZ -DENG_EXTERN_C mobj_t *Mobj_CreateXYZ(thinkfunc_t function, coord_t x, coord_t y, coord_t z, +DE_EXTERN_C mobj_t *Mobj_CreateXYZ(thinkfunc_t function, coord_t x, coord_t y, coord_t z, angle_t angle, coord_t radius, coord_t height, int ddflags) { return P_MobjCreate(function, Vec3d(x, y, z), angle, radius, height, ddflags); } // p_mobj.c -DENG_EXTERN_C void Mobj_Destroy(mobj_t *mobj); -DENG_EXTERN_C void Mobj_SetState(mobj_t *mobj, int statenum); -DENG_EXTERN_C angle_t Mobj_AngleSmoothed(mobj_t *mobj); -DENG_EXTERN_C void Mobj_OriginSmoothed(mobj_t *mobj, coord_t origin[3]); -DENG_EXTERN_C Sector *Mobj_Sector(mobj_t const *mobj); -DENG_EXTERN_C void Mobj_SpawnDamageParticleGen(mobj_t const *mobj, mobj_t const *inflictor, int amount); +DE_EXTERN_C void Mobj_Destroy(mobj_t *mobj); +DE_EXTERN_C void Mobj_SetState(mobj_t *mobj, int statenum); +DE_EXTERN_C angle_t Mobj_AngleSmoothed(mobj_t *mobj); +DE_EXTERN_C void Mobj_OriginSmoothed(mobj_t *mobj, coord_t origin[3]); +DE_EXTERN_C Sector *Mobj_Sector(mobj_t const *mobj); +DE_EXTERN_C void Mobj_SpawnDamageParticleGen(mobj_t const *mobj, mobj_t const *inflictor, int amount); // p_think.c -DENG_EXTERN_C struct mobj_s* Mobj_ById(int id); +DE_EXTERN_C struct mobj_s* Mobj_ById(int id); #undef Polyobj_SetCallback -DENG_EXTERN_C void Polyobj_SetCallback(void (*func) (struct mobj_s *, void *, void *)) +DE_EXTERN_C void Polyobj_SetCallback(void (*func) (struct mobj_s *, void *, void *)) { Polyobj::setCollisionCallback(func); } #undef Polyobj_Unlink -DENG_EXTERN_C void Polyobj_Unlink(Polyobj *po) +DE_EXTERN_C void Polyobj_Unlink(Polyobj *po) { if(!po) return; po->unlink(); } #undef Polyobj_Link -DENG_EXTERN_C void Polyobj_Link(Polyobj *po) +DE_EXTERN_C void Polyobj_Link(Polyobj *po) { if(!po) return; po->link(); } #undef Polyobj_ById -DENG_EXTERN_C Polyobj *Polyobj_ById(int index) +DE_EXTERN_C Polyobj *Polyobj_ById(int index) { if(!App_World().hasMap()) return nullptr; return App_World().map().polyobjPtr(index); } #undef Polyobj_ByTag -DENG_EXTERN_C Polyobj *Polyobj_ByTag(int tag) +DE_EXTERN_C Polyobj *Polyobj_ByTag(int tag) { Polyobj *found = nullptr; // not found. if(App_World().hasMap()) @@ -1739,44 +1739,44 @@ DENG_EXTERN_C Polyobj *Polyobj_ByTag(int tag) } #undef Polyobj_Move -DENG_EXTERN_C dd_bool Polyobj_Move(Polyobj *po, const_pvec3d_t xy) +DE_EXTERN_C dd_bool Polyobj_Move(Polyobj *po, const_pvec3d_t xy) { if(!po) return false; return po->move(xy); } #undef Polyobj_MoveXY -DENG_EXTERN_C dd_bool Polyobj_MoveXY(Polyobj *po, coord_t x, coord_t y) +DE_EXTERN_C dd_bool Polyobj_MoveXY(Polyobj *po, coord_t x, coord_t y) { if(!po) return false; return po->move(x, y); } #undef Polyobj_Rotate -DENG_EXTERN_C dd_bool Polyobj_Rotate(Polyobj *po, angle_t angle) +DE_EXTERN_C dd_bool Polyobj_Rotate(Polyobj *po, angle_t angle) { if(!po) return false; return po->rotate(angle); } #undef Polyobj_FirstLine -DENG_EXTERN_C Line *Polyobj_FirstLine(Polyobj *po) +DE_EXTERN_C Line *Polyobj_FirstLine(Polyobj *po) { if(!po) return 0; return po->lines()[0]; } #undef Line_PointDistance -DENG_EXTERN_C coord_t Line_PointDistance(Line *line, coord_t const point[2], coord_t *offset) +DE_EXTERN_C coord_t Line_PointDistance(Line *line, coord_t const point[2], coord_t *offset) { - DENG_ASSERT(line); + DE_ASSERT(line); return line->pointDistance(point, offset); } #undef Line_PointOnSide -DENG_EXTERN_C coord_t Line_PointOnSide(Line const *line, coord_t const point[2]) +DE_EXTERN_C coord_t Line_PointOnSide(Line const *line, coord_t const point[2]) { - DENG_ASSERT(line); + DE_ASSERT(line); if(!point) { LOG_AS("Line_PointOnSide"); @@ -1787,27 +1787,27 @@ DENG_EXTERN_C coord_t Line_PointOnSide(Line const *line, coord_t const point[2]) } #undef Line_BoxOnSide -DENG_EXTERN_C int Line_BoxOnSide(Line *line, AABoxd const *box) +DE_EXTERN_C int Line_BoxOnSide(Line *line, AABoxd const *box) { - DENG_ASSERT(line && box); + DE_ASSERT(line && box); return line->boxOnSide(*box); } #undef Line_BoxOnSide_FixedPrecision -DENG_EXTERN_C int Line_BoxOnSide_FixedPrecision(Line *line, AABoxd const *box) +DE_EXTERN_C int Line_BoxOnSide_FixedPrecision(Line *line, AABoxd const *box) { - DENG_ASSERT(line && box); + DE_ASSERT(line && box); return line->boxOnSide_FixedPrecision(*box); } #undef Line_Opening -DENG_EXTERN_C void Line_Opening(Line *line, LineOpening *opening) +DE_EXTERN_C void Line_Opening(Line *line, LineOpening *opening) { - DENG2_ASSERT(line && opening); + DE_ASSERT(line && opening); *opening = LineOpening(*line); } -DENG_DECLARE_API(Map) = +DE_DECLARE_API(Map) = { { DE_API_MAP }, P_MapExists, diff --git a/doomsday/apps/client/src/api_mapedit.cpp b/doomsday/apps/client/src/api_mapedit.cpp index 7a4de4bfdb..da204344d8 100644 --- a/doomsday/apps/client/src/api_mapedit.cpp +++ b/doomsday/apps/client/src/api_mapedit.cpp @@ -17,7 +17,7 @@ * 02110-1301 USA */ -#define DENG_NO_API_MACROS_MAP_EDIT +#define DE_NO_API_MACROS_MAP_EDIT #include "de_platform.h" #include "api_mapedit.h" @@ -339,7 +339,7 @@ int MPE_SectorCreate(float lightlevel, float red, float green, float blue, int MPE_PolyobjCreate(int const *lines, int lineCount, int tag, int sequenceType, coord_t originX, coord_t originY, int archiveIndex) { - DENG_UNUSED(archiveIndex); /// @todo Use this! + DE_UNUSED(archiveIndex); /// @todo Use this! ERROR_IF_NOT_INITIALIZED(); @@ -412,7 +412,7 @@ dd_bool MPE_GameObjProperty(char const *entityName, int elementIndex, return false; } -DENG_DECLARE_API(MPE) = +DE_DECLARE_API(MPE) = { { DE_API_MAP_EDIT }, diff --git a/doomsday/apps/client/src/api_uri.cpp b/doomsday/apps/client/src/api_uri.cpp index e2b20c5965..c6930e45ef 100644 --- a/doomsday/apps/client/src/api_uri.cpp +++ b/doomsday/apps/client/src/api_uri.cpp @@ -19,7 +19,7 @@ * 02110-1301 USA */ -#define DENG_NO_API_MACROS_URI // functions defined here +#define DE_NO_API_MACROS_URI // functions defined here #include "api_uri.h" #include @@ -31,11 +31,11 @@ #define TOINTERNAL_CONST(inst) reinterpret_cast(inst) #define SELF(inst) \ - DENG2_ASSERT(inst); \ + DE_ASSERT(inst); \ de::Uri* self = TOINTERNAL(inst) #define SELF_CONST(inst) \ - DENG2_ASSERT(inst); \ + DE_ASSERT(inst); \ de::Uri const* self = TOINTERNAL_CONST(inst) static void readUri(Uri *uri, Reader1 *reader, de::String defaultScheme = "") @@ -100,14 +100,14 @@ Uri* Uri_New(void) #undef Uri_Dup Uri* Uri_Dup(Uri const* other) { - DENG_ASSERT(other); + DE_ASSERT(other); return reinterpret_cast( new de::Uri(*(TOINTERNAL_CONST(other))) ); } #undef Uri_FromReader Uri* Uri_FromReader(Reader1 *reader) { - DENG_ASSERT(reader); + DE_ASSERT(reader); de::Uri* self = new de::Uri; Uri* uri = reinterpret_cast(self); @@ -131,7 +131,7 @@ void Uri_Delete(Uri* uri) Uri* Uri_Copy(Uri* uri, Uri const* other) { SELF(uri); - DENG_ASSERT(other); + DE_ASSERT(other); *self = *(TOINTERNAL_CONST(other)); return reinterpret_cast(self); } @@ -140,7 +140,7 @@ Uri* Uri_Copy(Uri* uri, Uri const* other) dd_bool Uri_Equality(Uri const* uri, Uri const* other) { SELF_CONST(uri); - DENG_ASSERT(other); + DE_ASSERT(other); return *self == (*(TOINTERNAL_CONST(other))); } @@ -234,24 +234,24 @@ AutoStr* Uri_ToString(Uri const* uri) #undef Uri_Write2 void Uri_Write2(Uri const* uri, struct writer_s* writer, int omitComponents) { - DENG_ASSERT(uri); - DENG_ASSERT(writer); + DE_ASSERT(uri); + DE_ASSERT(writer); writeUri(uri, writer, omitComponents); } #undef Uri_Write void Uri_Write(Uri const* uri, struct writer_s* writer) { - DENG_ASSERT(uri); - DENG_ASSERT(writer); + DE_ASSERT(uri); + DE_ASSERT(writer); writeUri(uri, writer); } #undef Uri_Read Uri* Uri_Read(Uri* uri, struct reader_s* reader) { - DENG_ASSERT(uri); - DENG_ASSERT(reader); + DE_ASSERT(uri); + DE_ASSERT(reader); readUri(uri, reader); return uri; } @@ -259,12 +259,12 @@ Uri* Uri_Read(Uri* uri, struct reader_s* reader) #undef Uri_ReadWithDefaultScheme void Uri_ReadWithDefaultScheme(Uri* uri, struct reader_s* reader, char const* defaultScheme) { - DENG_ASSERT(uri); - DENG_ASSERT(reader); + DE_ASSERT(uri); + DE_ASSERT(reader); readUri(uri, reader, defaultScheme); } -DENG_DECLARE_API(Uri) = +DE_DECLARE_API(Uri) = { { DE_API_URI }, Uri_New, diff --git a/doomsday/apps/client/src/audio/audiodriver.cpp b/doomsday/apps/client/src/audio/audiodriver.cpp index d0de8a8d11..9f21d39e3e 100644 --- a/doomsday/apps/client/src/audio/audiodriver.cpp +++ b/doomsday/apps/client/src/audio/audiodriver.cpp @@ -22,7 +22,7 @@ #include "dd_main.h" #include "audio/sys_audiod_dummy.h" -#ifndef DENG_DISABLE_SDLMIXER +#ifndef DE_DISABLE_SDLMIXER # include "audio/sys_audiod_sdlmixer.h" #endif @@ -32,7 +32,7 @@ using namespace de; -DENG2_PIMPL(AudioDriver) +DE_PIMPL(AudioDriver) { bool initialized = false; ::Library *library = nullptr; @@ -71,7 +71,7 @@ DENG2_PIMPL(AudioDriver) void getDummyInterfaces() { - DENG2_ASSERT(!initialized); + DE_ASSERT(!initialized); library = nullptr; std::memcpy(&iBase, &audiod_dummy, sizeof(iBase)); @@ -80,10 +80,10 @@ DENG2_PIMPL(AudioDriver) std::memcpy(&iCd, &audiod_dummy_cd, sizeof(iCd)); } -#ifndef DENG_DISABLE_SDLMIXER +#ifndef DE_DISABLE_SDLMIXER void getSdlMixerInterfaces() { - DENG2_ASSERT(!initialized); + DE_ASSERT(!initialized); library = nullptr; std::memcpy(&iBase, &audiod_sdlmixer, sizeof(iBase)); @@ -95,7 +95,7 @@ DENG2_PIMPL(AudioDriver) void importInterfaces(LibraryFile &libFile) { - DENG2_ASSERT(!initialized); + DE_ASSERT(!initialized); zap(iBase); zap(iSfx); @@ -184,7 +184,7 @@ String AudioDriver::statusAsText() const case Initialized: return "Initialized"; default: - DENG2_ASSERT_FAIL("AudioDriver::statusAsText: Unknown status"); + DE_ASSERT_FAIL("AudioDriver::statusAsText: Unknown status"); return "Unknown"; } } @@ -205,7 +205,7 @@ void AudioDriver::load(String const &identifier) d->getDummyInterfaces(); return; } -#ifndef DENG_DISABLE_SDLMIXER +#ifndef DE_DISABLE_SDLMIXER if(!identifier.compareWithoutCase("sdlmixer")) { d->getSdlMixerInterfaces(); @@ -260,7 +260,7 @@ void AudioDriver::initialize() // Already been here? if(d->initialized) return; - DENG2_ASSERT(d->iBase.Init != nullptr); + DE_ASSERT(d->iBase.Init != nullptr); d->initialized = d->iBase.Init(); } @@ -286,7 +286,7 @@ ::Library *AudioDriver::library() const bool AudioDriver::isAvailable(String const &identifier) { if (identifier == "dummy") return true; -#ifndef DENG_DISABLE_SDLMIXER +#ifndef DE_DISABLE_SDLMIXER if (identifier == "sdlmixer") return true; #else if (identifier == "sdlmixer") return false; @@ -368,6 +368,6 @@ String AudioDriver_GetName(audiodriverid_t id) if(VALID_AUDIODRIVER_IDENTIFIER(id)) return audioDriverNames[id]; - DENG2_ASSERT_FAIL("S_GetDriverName: Unknown driver id"); + DE_ASSERT_FAIL("S_GetDriverName: Unknown driver id"); return ""; } diff --git a/doomsday/apps/client/src/audio/base/audiosystem.cpp b/doomsday/apps/client/src/audio/base/audiosystem.cpp index e0d6af005f..fb03c64f50 100644 --- a/doomsday/apps/client/src/audio/base/audiosystem.cpp +++ b/doomsday/apps/client/src/audio/base/audiosystem.cpp @@ -18,7 +18,7 @@ * http://www.gnu.org/licenses */ -#define DENG_NO_API_MACROS_SOUND +#define DE_NO_API_MACROS_SOUND #include "audio/audiosystem.h" @@ -82,7 +82,7 @@ dint sfxRate = 11025; #ifdef __CLIENT__ # if defined(MACOSX) && defined(MACOS_HAVE_QTKIT) /// Built-in QuickTime audio interface implemented by MusicPlayer.m -DENG_EXTERN_C audiointerface_music_t audiodQuickTimeMusic; +DE_EXTERN_C audiointerface_music_t audiodQuickTimeMusic; # endif #endif @@ -186,10 +186,10 @@ static bool recognizeMus(de::File1 &file) } #endif -DENG2_PIMPL(AudioSystem) -, DENG2_OBSERVES(DoomsdayApp, GameUnload) +DE_PIMPL(AudioSystem) +, DE_OBSERVES(DoomsdayApp, GameUnload) #ifdef __CLIENT__ -, DENG2_OBSERVES(audio::SfxSampleCache, SampleRemove) +, DE_OBSERVES(audio::SfxSampleCache, SampleRemove) #endif { Record module; @@ -199,7 +199,7 @@ DENG2_PIMPL(AudioSystem) AudioDriver &driverById(audiodriverid_t id) { - DENG2_ASSERT(VALID_AUDIODRIVER_IDENTIFIER(id)); + DE_ASSERT(VALID_AUDIODRIVER_IDENTIFIER(id)); return drivers[id]; } @@ -231,7 +231,7 @@ DENG2_PIMPL(AudioSystem) return AUDIOD_WINMM; #endif -#ifndef DENG_DISABLE_SDLMIXER +#ifndef DE_DISABLE_SDLMIXER if (cmdLine.has("-sdlmixer")) return AUDIOD_SDL_MIXER; @@ -268,7 +268,7 @@ DENG2_PIMPL(AudioSystem) case AUDIOD_FLUIDSYNTH: driver.load(idStr); break; -#ifndef DENG_DISABLE_SDLMIXER +#ifndef DE_DISABLE_SDLMIXER case AUDIOD_SDL_MIXER: driver.load(idStr); break; @@ -323,7 +323,7 @@ DENG2_PIMPL(AudioSystem) audiodriverid_t defaultDriverId = chooseAudioDriver(); initDriver(defaultDriverId); -/*#ifndef DENG_DISABLE_SDLMIXER +/*#ifndef DE_DISABLE_SDLMIXER // Fallback option for the default driver. if (!ok) { @@ -709,7 +709,7 @@ DENG2_PIMPL(AudioSystem) dint playMusicFile(String const &virtualOrNativePath, bool looped = false) { - DENG2_ASSERT(musAvail); + DE_ASSERT(musAvail); if (virtualOrNativePath.isEmpty()) return 0; @@ -766,7 +766,7 @@ DENG2_PIMPL(AudioSystem) */ dint playMusicLump(lumpnum_t lumpNum, bool looped = false, bool canPlayMUS = true) { - DENG2_ASSERT(musAvail); + DE_ASSERT(musAvail); if (!App_FileSystem().nameIndex().hasLump(lumpNum)) return 0; @@ -1462,7 +1462,7 @@ AudioSystem::AudioSystem() : d(new Impl(this)) AudioSystem &AudioSystem::get() { - DENG2_ASSERT(theAudioSystem); + DE_ASSERT(theAudioSystem); return *theAudioSystem; } @@ -1847,7 +1847,7 @@ dint AudioSystem::playMusic(Record const &definition, bool looped) break; } - default: DENG2_ASSERT_FAIL("Mus_Start: Invalid value for order[i]"); break; + default: DE_ASSERT_FAIL("Mus_Start: Invalid value for order[i]"); break; } } @@ -2100,7 +2100,7 @@ void AudioSystem::stopSound(dint soundId, mobj_t const *emitter, dint flags) dint AudioSystem::playSound(sfxsample_t *sample, dfloat volume, dfloat freq, mobj_t const *emitter, coord_t *fixedOrigin, dint flags) { - DENG2_ASSERT(sample); + DE_ASSERT(sample); if (!d->sfxAvail) return false; bool const play3D = sfx3D && (emitter || fixedOrigin); @@ -2156,7 +2156,7 @@ dint AudioSystem::playSound(sfxsample_t *sample, dfloat volume, dfloat freq, mob sfxbuffer_t &sbuf = ch.buffer(); if ((sbuf.flags & SFXBF_PLAYING)) { - DENG2_ASSERT(sbuf.sample != nullptr); + DE_ASSERT(sbuf.sample != nullptr); if (sbuf.sample->id == sample->id && (myPrio >= chPriority && (!selCh || chPriority <= lowPrio))) @@ -2274,7 +2274,7 @@ dint AudioSystem::playSound(sfxsample_t *sample, dfloat volume, dfloat freq, mob return false; } - DENG2_ASSERT(selCh->hasBuffer()); + DE_ASSERT(selCh->hasBuffer()); // The sample buffer may need to be reformatted. if (selCh->buffer().rate != sample->rate || @@ -2432,7 +2432,7 @@ bool AudioSystem::hasSfxChannels() audio::SfxChannels &AudioSystem::sfxChannels() const { - DENG2_ASSERT(d->sfxChannels.get() != nullptr); + DE_ASSERT(d->sfxChannels.get() != nullptr); return *d->sfxChannels; } @@ -2506,7 +2506,7 @@ void AudioSystem::worldMapChanged() */ D_CMD(PlaySound) { - DENG2_UNUSED(src); + DE_UNUSED(src); if (argc < 2) { @@ -2566,7 +2566,7 @@ D_CMD(PlaySound) */ D_CMD(PlayMusic) { - DENG2_UNUSED(src); + DE_UNUSED(src); LOG_AS("playmusic (Cmd)"); @@ -2621,7 +2621,7 @@ D_CMD(PlayMusic) D_CMD(StopMusic) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); App_AudioSystem().stopMusic(); return true; @@ -2629,7 +2629,7 @@ D_CMD(StopMusic) D_CMD(PauseMusic) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); App_AudioSystem().pauseMusic(!App_AudioSystem().musicIsPaused()); return true; @@ -2647,7 +2647,7 @@ static void musicMidiFontChanged() D_CMD(ReverbParameters) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); dfloat args[NUM_REVERB_DATA]; @@ -2728,7 +2728,7 @@ void S_PauseMusic(dd_bool paused) #ifdef __CLIENT__ App_AudioSystem().pauseMusic(paused); #else - DENG2_UNUSED(paused); + DE_UNUSED(paused); #endif } @@ -2737,7 +2737,7 @@ dint Mus_Start(Record const &definition, bool looped) #ifdef __CLIENT__ return App_AudioSystem().playMusic(definition, looped); #else - DENG2_UNUSED2(definition, looped); + DE_UNUSED(definition, looped); return 0; #endif } @@ -2747,7 +2747,7 @@ dint Mus_StartLump(lumpnum_t lumpNum, bool looped) #ifdef __CLIENT__ return App_AudioSystem().playMusicLump(lumpNum, looped); #else - DENG2_UNUSED2(lumpNum, looped); + DE_UNUSED(lumpNum, looped); return 0; #endif } @@ -2757,7 +2757,7 @@ dint Mus_StartFile(char const *filePath, bool looped) #ifdef __CLIENT__ return App_AudioSystem().playMusicFile(filePath, looped); #else - DENG2_UNUSED2(filePath, looped); + DE_UNUSED(filePath, looped); return 0; #endif } @@ -2767,7 +2767,7 @@ dint Mus_StartCDTrack(dint cdTrack, bool looped) #ifdef __CLIENT__ return App_AudioSystem().playMusicCDTrack(cdTrack, looped); #else - DENG2_UNUSED2(cdTrack, looped); + DE_UNUSED(cdTrack, looped); return 0; #endif } @@ -2785,7 +2785,7 @@ dint S_StartMusicNum(dint musicId, dd_bool looped) } return false; #else - DENG2_UNUSED2(musicId, looped); + DE_UNUSED(musicId, looped); return false; #endif } @@ -2897,7 +2897,7 @@ dint S_LocalSoundAtVolumeFrom(dint soundIdAndFlags, mobj_t const *origin, coord_ return App_AudioSystem().playSound(sample, volume, freq, origin, point, flags); #else - DENG2_UNUSED4(soundIdAndFlags, origin, point, volume); + DE_UNUSED(soundIdAndFlags, origin, point, volume); return false; #endif } @@ -3004,7 +3004,7 @@ dint S_StopSoundWithLowerPriority(dint soundId, mobj_t *emitter, dint defPriorit #endif // __CLIENT__ -DENG_DECLARE_API(S) = +DE_DECLARE_API(S) = { { DE_API_SOUND }, S_LocalSoundAtVolumeFrom, diff --git a/doomsday/apps/client/src/audio/base/s_cache.cpp b/doomsday/apps/client/src/audio/base/s_cache.cpp index 1b19d58d86..f8cdd406c5 100644 --- a/doomsday/apps/client/src/audio/base/s_cache.cpp +++ b/doomsday/apps/client/src/audio/base/s_cache.cpp @@ -64,7 +64,7 @@ static dint upsampleFactor(dint rate) factor = de::max(1, ::sfxRate / rate); } #else - DENG2_UNUSED(rate); + DE_UNUSED(rate); #endif return factor; } @@ -87,7 +87,7 @@ static dshort inline U8_S16(duchar b) static void resample(void *dst, dint dstBytesPer, dint dstRate, void const *src, dint srcBytesPer, dint srcRate, dint srcNumSamples, duint srcSize) { - DENG2_ASSERT(src && dst); + DE_ASSERT(src && dst); // Let's first check for the easy cases. if (dstRate == srcRate) @@ -250,8 +250,8 @@ static void resample(void *dst, dint dstBytesPer, dint dstRate, void const *src, void configureSample(sfxsample_t &smp, void const *data, duint size, dint numSamples, dint bytesPer, dint rate) { - DENG2_UNUSED(data); - DENG2_UNUSED(size); + DE_UNUSED(data); + DE_UNUSED(size); zap(smp); smp.bytesPer = bytesPer; @@ -308,7 +308,7 @@ void SfxSampleCache::CacheItem::replaceSample(sfxsample_t &newSample) //--------------------------------------------------------------------------------------- -DENG2_PIMPL(SfxSampleCache) +DE_PIMPL(SfxSampleCache) { /** * Cached samples are placed in a hash (key: sound id). @@ -475,16 +475,16 @@ DENG2_PIMPL(SfxSampleCache) */ void notifyRemove(CacheItem &item) { - DENG2_FOR_PUBLIC_AUDIENCE2(SampleRemove, i) + DE_FOR_PUBLIC_AUDIENCE2(SampleRemove, i) { i->sfxSampleCacheAboutToRemove(item.sample); } } - DENG2_PIMPL_AUDIENCE(SampleRemove) + DE_PIMPL_AUDIENCE(SampleRemove) }; -DENG2_AUDIENCE_METHOD(SfxSampleCache, SampleRemove) +DE_AUDIENCE_METHOD(SfxSampleCache, SampleRemove) SfxSampleCache::SfxSampleCache() : d(new Impl(this)) {} diff --git a/doomsday/apps/client/src/audio/s_environ.cpp b/doomsday/apps/client/src/audio/s_environ.cpp index 683d8fcfe9..6ce9231a10 100644 --- a/doomsday/apps/client/src/audio/s_environ.cpp +++ b/doomsday/apps/client/src/audio/s_environ.cpp @@ -37,13 +37,13 @@ static AudioEnvironment envInfo[1 + NUM_AUDIO_ENVIRONMENTS] = { char const *S_AudioEnvironmentName(AudioEnvironmentId id) { - DENG2_ASSERT(id >= AE_NONE && id < NUM_AUDIO_ENVIRONMENTS); + DE_ASSERT(id >= AE_NONE && id < NUM_AUDIO_ENVIRONMENTS); return ::envInfo[1 + dint( id )].name; } AudioEnvironment const &S_AudioEnvironment(AudioEnvironmentId id) { - DENG2_ASSERT(id >= AE_NONE && id < NUM_AUDIO_ENVIRONMENTS); + DE_ASSERT(id >= AE_NONE && id < NUM_AUDIO_ENVIRONMENTS); return ::envInfo[1 + dint( id )]; } diff --git a/doomsday/apps/client/src/audio/sfxchannel.cpp b/doomsday/apps/client/src/audio/sfxchannel.cpp index fe97e24bbd..bbaaaedf19 100644 --- a/doomsday/apps/client/src/audio/sfxchannel.cpp +++ b/doomsday/apps/client/src/audio/sfxchannel.cpp @@ -42,7 +42,7 @@ using namespace de; namespace audio { -DENG2_PIMPL_NOREF(SfxChannel) +DE_PIMPL_NOREF(SfxChannel) { dint flags = 0; ///< SFXCF_* flags. dfloat frequency = 0; ///< Frequency adjustment: 1.0 is normal. @@ -324,7 +324,7 @@ void SfxChannel::setStartTime(dint newStartTime) d->startTime = newStartTime; } -DENG2_PIMPL(SfxChannels) +DE_PIMPL(SfxChannels) { QList all; @@ -361,7 +361,7 @@ dint SfxChannels::count() const dint SfxChannels::countPlaying(dint id) { - DENG2_ASSERT( App_AudioSystem().sfxIsAvailable() ); // sanity check + DE_ASSERT( App_AudioSystem().sfxIsAvailable() ); // sanity check dint count = 0; forAll([&id, &count] (SfxChannel &ch) @@ -446,14 +446,14 @@ void Sfx_ChannelDrawer() { if (!::showSoundInfo) return; - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); // Go into screen projection mode. DGL_MatrixMode(DGL_PROJECTION); DGL_PushMatrix(); DGL_LoadIdentity(); - DGL_Ortho(0, 0, DENG_GAMEVIEW_WIDTH, DENG_GAMEVIEW_HEIGHT, -1, 1); + DGL_Ortho(0, 0, DE_GAMEVIEW_WIDTH, DE_GAMEVIEW_HEIGHT, -1, 1); DGL_Enable(DGL_TEXTURE_2D); diff --git a/doomsday/apps/client/src/audio/sys_audiod_dummy.cpp b/doomsday/apps/client/src/audio/sys_audiod_dummy.cpp index de1a2293f8..6db37a8915 100644 --- a/doomsday/apps/client/src/audio/sys_audiod_dummy.cpp +++ b/doomsday/apps/client/src/audio/sys_audiod_dummy.cpp @@ -45,10 +45,10 @@ void DS_Dummy_SFX_Listener(int prop, float value); void DS_Dummy_SFX_Listenerv(int prop, float* values); int DS_Dummy_SFX_Getv(int prop, void* values); -DENG_EXTERN_C audiodriver_t audiod_dummy; -DENG_EXTERN_C audiointerface_sfx_t audiod_dummy_sfx; -DENG_EXTERN_C audiointerface_music_t audiod_dummy_music; -DENG_EXTERN_C audiointerface_cd_t audiod_dummy_cd; +DE_EXTERN_C audiodriver_t audiod_dummy; +DE_EXTERN_C audiointerface_sfx_t audiod_dummy_sfx; +DE_EXTERN_C audiointerface_music_t audiod_dummy_music; +DE_EXTERN_C audiointerface_cd_t audiod_dummy_cd; audiodriver_t audiod_dummy = { DS_DummyInit, diff --git a/doomsday/apps/client/src/audio/sys_audiod_sdlmixer.cpp b/doomsday/apps/client/src/audio/sys_audiod_sdlmixer.cpp index 49b169e8f7..67074a169a 100644 --- a/doomsday/apps/client/src/audio/sys_audiod_sdlmixer.cpp +++ b/doomsday/apps/client/src/audio/sys_audiod_sdlmixer.cpp @@ -17,7 +17,7 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_DISABLE_SDLMIXER +#ifndef DE_DISABLE_SDLMIXER #include "de_base.h" #include "audio/sys_audiod_sdlmixer.h" @@ -554,4 +554,4 @@ int DS_SDLMixer_Music_PlayFile(const char* filename, int looped) return result; } -#endif // DENG_DISABLE_SDLMIXER +#endif // DE_DISABLE_SDLMIXER diff --git a/doomsday/apps/client/src/busyrunner.cpp b/doomsday/apps/client/src/busyrunner.cpp index 933d5dc78d..dd503c90b5 100644 --- a/doomsday/apps/client/src/busyrunner.cpp +++ b/doomsday/apps/client/src/busyrunner.cpp @@ -58,11 +58,11 @@ static BusyMode &busy() return DoomsdayApp::app().busyMode(); } -DENG2_PIMPL_NOREF(BusyRunner) -, DENG2_OBSERVES(BusyMode, Beginning) -, DENG2_OBSERVES(BusyMode, End) -, DENG2_OBSERVES(BusyMode, TaskWillStart) -, DENG2_OBSERVES(BusyMode, Abort) +DE_PIMPL_NOREF(BusyRunner) +, DE_OBSERVES(BusyMode, Beginning) +, DE_OBSERVES(BusyMode, End) +, DE_OBSERVES(BusyMode, TaskWillStart) +, DE_OBSERVES(BusyMode, Abort) { QEventLoop *eventLoop = nullptr; @@ -149,8 +149,8 @@ DENG2_PIMPL_NOREF(BusyRunner) */ void exitEventLoop() { - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT(eventLoop); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT(eventLoop); busyDone = true; @@ -166,10 +166,10 @@ DENG2_PIMPL_NOREF(BusyRunner) } } - DENG2_PIMPL_AUDIENCE(DeferredGLTask) + DE_PIMPL_AUDIENCE(DeferredGLTask) }; -DENG2_AUDIENCE_METHOD(BusyRunner, DeferredGLTask) +DE_AUDIENCE_METHOD(BusyRunner, DeferredGLTask) static BusyRunner &busyRunner() { @@ -188,9 +188,9 @@ BusyRunner::BusyRunner() : d(new Impl) */ static void busyWorkerTerminated(systhreadexitstatus_t status) { - DENG_ASSERT(busy().isActive()); + DE_ASSERT(busy().isActive()); - if (status == DENG_THREAD_STOPPED_WITH_EXCEPTION) + if (status == DE_THREAD_STOPPED_WITH_EXCEPTION) { busy().abort("Uncaught exception from busy thread"); } @@ -214,7 +214,7 @@ BusyRunner::Result BusyRunner::runTask(BusyTask *task) // background while we keep the user occupied with nice animations. d->busyThread = Sys_StartThread(task->worker, task->workerData, busyWorkerTerminated); - DENG_ASSERT(!d->eventLoop); + DE_ASSERT(!d->eventLoop); // Run a local event loop since the primary event loop is blocked while // we're busy. This event loop is able to handle window and input events @@ -289,7 +289,7 @@ void BusyRunner::loop() bool pendingRemain = false; if (ClientWindow::main().home().isHidden()) { - DENG2_FOR_AUDIENCE2(DeferredGLTask, i) + DE_FOR_AUDIENCE2(DeferredGLTask, i) { if (i->performDeferredGLTask() == TasksPending) { @@ -347,13 +347,13 @@ void BusyMode_FreezeGameForBusyMode(void) DoomsdayApp::app().busyMode().taskRunner() && App::inMainThread()) { -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) ClientWindow::main().busy().renderTransitionFrame(); #endif } } -DENG_DECLARE_API(Busy) = +DE_DECLARE_API(Busy) = { { DE_API_BUSY }, BusyMode_FreezeGameForBusyMode diff --git a/doomsday/apps/client/src/client/cl_main.cpp b/doomsday/apps/client/src/client/cl_main.cpp index 0ba2da445e..e3520eb56b 100644 --- a/doomsday/apps/client/src/client/cl_main.cpp +++ b/doomsday/apps/client/src/client/cl_main.cpp @@ -336,7 +336,7 @@ void Cl_GetPackets() case PKT_CHAT: { int msgfrom = Reader_ReadByte(msgReader); int mask = Reader_ReadUInt32(msgReader); - DENG2_UNUSED(mask); + DE_UNUSED(mask); size_t len = Reader_ReadUInt16(msgReader); char *msg = (char *) M_Malloc(len + 1); Reader_Read(msgReader, msg, len); @@ -357,7 +357,7 @@ void Cl_GetPackets() char *text = (char *) M_Malloc(textLen + 1); Reader_Read(msgReader, text, textLen); text[textLen] = 0; - DENG_UNUSED(conFlags); + DE_UNUSED(conFlags); LOG_NOTE("%s") << text; M_Free(text); break; } @@ -393,7 +393,7 @@ void Cl_GetPackets() } } -#ifdef DENG_DEBUG +#ifdef DE_DEBUG /** * Check the state of the client on engineside. A debugging utility. @@ -435,7 +435,7 @@ static void assertPlayerIsValid(int plrNum) } } -#endif // DENG_DEBUG +#endif // DE_DEBUG void Cl_Ticker(timespan_t ticLength) { @@ -471,7 +471,7 @@ void Cl_Ticker(timespan_t ticLength) ClPlayer_ApplyPendingFixes(i); ClPlayer_UpdateOrigin(i); -#ifdef DENG_DEBUG +#ifdef DE_DEBUG assertPlayerIsValid(i); #endif } @@ -487,7 +487,7 @@ void Cl_Ticker(timespan_t ticLength) */ D_CMD(Login) { - DENG2_UNUSED(src); + DE_UNUSED(src); // Only clients can log in. if (!isClient) diff --git a/doomsday/apps/client/src/client/cl_mobj.cpp b/doomsday/apps/client/src/client/cl_mobj.cpp index 23cdb96ab2..2c0c863c20 100644 --- a/doomsday/apps/client/src/client/cl_mobj.cpp +++ b/doomsday/apps/client/src/client/cl_mobj.cpp @@ -19,7 +19,7 @@ * 02110-1301 USA */ -#define DENG_NO_API_MACROS_CLIENT +#define DE_NO_API_MACROS_CLIENT #include "de_base.h" #include "client/cl_mobj.h" @@ -62,8 +62,8 @@ ClMobjInfo::ClMobjInfo() mobj_t *ClMobjInfo::mobj() { - DENG2_ASSERT(startMagic == CLM_MAGIC1); - DENG2_ASSERT(endMagic == CLM_MAGIC2); + DE_ASSERT(startMagic == CLM_MAGIC1); + DE_ASSERT(endMagic == CLM_MAGIC2); return reinterpret_cast((char *)this + sizeof(ClMobjInfo)); } @@ -213,7 +213,7 @@ void Cl_UpdateRealPlayerMobj(mobj_t *localMobj, mobj_t *remoteClientMobj, dd_bool Cl_IsClientMobj(mobj_t const *mob) { - DENG2_ASSERT(mob); + DE_ASSERT(mob); if (ClientMobjThinkerData *data = THINKER_DATA_MAYBE(mob->thinker, ClientMobjThinkerData)) { return data->hasRemoteSync(); @@ -628,9 +628,9 @@ mobj_t *ClMobj_Find(thid_t id) // cl_player.c #undef ClPlayer_ClMobj -DENG_EXTERN_C mobj_t *ClPlayer_ClMobj(int plrNum); +DE_EXTERN_C mobj_t *ClPlayer_ClMobj(int plrNum); -DENG_DECLARE_API(Client) = +DE_DECLARE_API(Client) = { { DE_API_CLIENT }, ClMobj_Find, diff --git a/doomsday/apps/client/src/client/cl_player.cpp b/doomsday/apps/client/src/client/cl_player.cpp index c5ca84f758..b11031cfb6 100644 --- a/doomsday/apps/client/src/client/cl_player.cpp +++ b/doomsday/apps/client/src/client/cl_player.cpp @@ -63,7 +63,7 @@ clplayerstate_t *ClPlayer_State(int plrNum) } #undef ClPlayer_ClMobj -DENG_EXTERN_C struct mobj_s *ClPlayer_ClMobj(int plrNum) +DE_EXTERN_C struct mobj_s *ClPlayer_ClMobj(int plrNum) { if (plrNum < 0 || plrNum >= DDMAXPLAYERS) return 0; return ClMobj_Find(ClPlayer_State(plrNum)->clMobjId); @@ -71,7 +71,7 @@ DENG_EXTERN_C struct mobj_s *ClPlayer_ClMobj(int plrNum) void ClPlayer_UpdateOrigin(int plrNum) { - DENG2_ASSERT(plrNum >= 0 && plrNum < DDMAXPLAYERS); + DE_ASSERT(plrNum >= 0 && plrNum < DDMAXPLAYERS); player_t *plr = DD_Player(plrNum); clplayerstate_t *s = ClPlayer_State(plrNum); @@ -115,7 +115,7 @@ void ClPlayer_ApplyPendingFixes(int plrNum) if (clmo->thinker.id != state->pendingFixTargetClMobjId) return; - DENG_ASSERT(clmo->thinker.id == state->clMobjId); + DE_ASSERT(clmo->thinker.id == state->clMobjId); if (state->pendingFixes & DDPF_FIXANGLES) { @@ -381,7 +381,7 @@ void ClPlayer_ReadDelta() if (df & PDF_ANGLE) { //s->angle = Reader_ReadByte(msgReader) << 24; - DENG_UNUSED(Reader_ReadByte(msgReader)); + DE_UNUSED(Reader_ReadByte(msgReader)); } if (df & PDF_TURNDELTA) diff --git a/doomsday/apps/client/src/client/cl_sound.cpp b/doomsday/apps/client/src/client/cl_sound.cpp index 2afb6ed7a1..9da1de3a04 100644 --- a/doomsday/apps/client/src/client/cl_sound.cpp +++ b/doomsday/apps/client/src/client/cl_sound.cpp @@ -292,7 +292,7 @@ void Cl_Sound() else if (flags & SNDF_PLAYER) { dint const player = (flags & 0xf0) >> 4; - DENG2_ASSERT(player >= 0 && player < DDMAXPLAYERS); + DE_ASSERT(player >= 0 && player < DDMAXPLAYERS); S_LocalSoundAtVolume(sound, DD_Player(player)->publicData().mo, volume / 127.0f); } else diff --git a/doomsday/apps/client/src/client/cl_world.cpp b/doomsday/apps/client/src/client/cl_world.cpp index 990f86cfd2..d41970fea5 100644 --- a/doomsday/apps/client/src/client/cl_world.cpp +++ b/doomsday/apps/client/src/client/cl_world.cpp @@ -164,7 +164,7 @@ void Cl_ReadSectorDelta(dint /*deltaType*/) // Sector index number. Sector *sec = map.sectorPtr(Reader_ReadUInt16(msgReader)); - DENG2_ASSERT(sec); + DE_ASSERT(sec); // Flags. dint df = Reader_ReadPackedUInt32(msgReader); @@ -266,7 +266,7 @@ void Cl_ReadSideDelta(dint /*deltaType*/) dint const df = Reader_ReadPackedUInt32(msgReader); // Flags. LineSide *side = map.sidePtr(index); - DENG2_ASSERT(side != 0); + DE_ASSERT(side != 0); if (df & SIDF_TOP_MATERIAL) { diff --git a/doomsday/apps/client/src/client/cledgeloop.cpp b/doomsday/apps/client/src/client/cledgeloop.cpp index 25c968bf84..63508bfa47 100644 --- a/doomsday/apps/client/src/client/cledgeloop.cpp +++ b/doomsday/apps/client/src/client/cledgeloop.cpp @@ -34,7 +34,7 @@ using namespace de; namespace world { -DENG2_PIMPL(ClEdgeLoop) +DE_PIMPL(ClEdgeLoop) { ClientSubsector &owner; HEdge *firstHEdge = nullptr; @@ -201,7 +201,7 @@ String ClEdgeLoop::description() const " " _E(l) "Half-edge: " _E(.)_E(i) "%2" _E(.)) .arg(ClientSubsector::edgeLoopIdAsText(loopId()).upperFirstChar()) .arg(String("[0x%1]").arg(de::dintptr(d->firstHEdge), 0, 16)); - DENG2_DEBUG_ONLY( + DE_DEBUG_ONLY( desc.prepend(String(_E(b) "ClEdgeLoop " _E(.) "[0x%1]\n").arg(de::dintptr(this), 0, 16)); ) return desc; @@ -224,19 +224,19 @@ bool ClEdgeLoop::isOuter() const HEdge &ClEdgeLoop::first() const { - DENG2_ASSERT(d->firstHEdge); + DE_ASSERT(d->firstHEdge); return *d->firstHEdge; } bool ClEdgeLoop::isSelfReferencing() const { - DENG2_ASSERT(d->firstHEdge); + DE_ASSERT(d->firstHEdge); return d->firstHEdge->mapElementAs().line().isSelfReferencing(); } bool ClEdgeLoop::hasBackSubsector() const { - DENG2_ASSERT(d->firstHEdge); + DE_ASSERT(d->firstHEdge); return d->firstHEdge->hasTwin() && d->firstHEdge->twin().hasFace() && d->firstHEdge->twin().face().mapElementAs().hasSubsector(); @@ -244,13 +244,13 @@ bool ClEdgeLoop::hasBackSubsector() const ClientSubsector &ClEdgeLoop::backSubsector() const { - DENG2_ASSERT(d->firstHEdge); + DE_ASSERT(d->firstHEdge); return d->firstHEdge->twin().face().mapElementAs().subsector().as(); } void ClEdgeLoop::fixSurfacesMissingMaterials() { - DENG2_ASSERT(d->firstHEdge); + DE_ASSERT(d->firstHEdge); SubsectorCirculator it(d->firstHEdge); do { diff --git a/doomsday/apps/client/src/client/clientsubsector.cpp b/doomsday/apps/client/src/client/clientsubsector.cpp index d92256f02d..930ce8f2b9 100644 --- a/doomsday/apps/client/src/client/clientsubsector.cpp +++ b/doomsday/apps/client/src/client/clientsubsector.cpp @@ -65,13 +65,13 @@ enum SubsectorFlag Q_DECLARE_FLAGS(SubsectorFlags, SubsectorFlag) Q_DECLARE_OPERATORS_FOR_FLAGS(SubsectorFlags) -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG /** * Returns a textual, map-relative path for the given @a surface. */ static DotPath composeSurfacePath(Surface const &surface) { - DENG2_ASSERT(surface.hasParent()); + DE_ASSERT(surface.hasParent()); MapElement const &owner = surface.parent(); switch (owner.type()) @@ -92,29 +92,29 @@ static DotPath composeSurfacePath(Surface const &surface) default: return ""; } } -#endif // DENG2_DEBUG +#endif // DE_DEBUG /** * @todo optimize: Translation of decorations on the world up axis would be a trivial * operation to perform, which, would not require plotting decorations again. This * frequent case should be designed for. -ds */ -DENG2_PIMPL(ClientSubsector) -, DENG2_OBSERVES(Subsector, Deletion) -, DENG2_OBSERVES(Plane, Deletion) - -//, DENG2_OBSERVES(Sector, LightColorChange) -//, DENG2_OBSERVES(Sector, LightLevelChange) - -, DENG2_OBSERVES(Line, FlagsChange) -, DENG2_OBSERVES(Plane, HeightChange) -, DENG2_OBSERVES(Plane, HeightSmoothedChange) -, DENG2_OBSERVES(Surface, MaterialChange) -, DENG2_OBSERVES(Surface, OriginChange) -, DENG2_OBSERVES(Surface, OriginSmoothedChange) - -, DENG2_OBSERVES(Material, DimensionsChange) -, DENG2_OBSERVES(MaterialAnimator, DecorationStageChange) +DE_PIMPL(ClientSubsector) +, DE_OBSERVES(Subsector, Deletion) +, DE_OBSERVES(Plane, Deletion) + +//, DE_OBSERVES(Sector, LightColorChange) +//, DE_OBSERVES(Sector, LightLevelChange) + +, DE_OBSERVES(Line, FlagsChange) +, DE_OBSERVES(Plane, HeightChange) +, DE_OBSERVES(Plane, HeightSmoothedChange) +, DE_OBSERVES(Surface, MaterialChange) +, DE_OBSERVES(Surface, OriginChange) +, DE_OBSERVES(Surface, OriginSmoothedChange) + +, DE_OBSERVES(Material, DimensionsChange) +, DE_OBSERVES(MaterialAnimator, DecorationStageChange) { struct BoundaryData { @@ -169,7 +169,7 @@ DENG2_PIMPL(ClientSubsector) typedef QMap Shards; struct GeometryGroups : public QMap { - ~GeometryGroups() { DENG2_FOR_EACH(GeometryGroups, g, *this) qDeleteAll(*g); } + ~GeometryGroups() { DE_FOR_EACH(GeometryGroups, g, *this) qDeleteAll(*g); } }; struct DecoratedSurface : public Surface::IDecorationState @@ -485,7 +485,7 @@ DENG2_PIMPL(ClientSubsector) else { // Multiple neighbors require testing of bounding boxes. - DENG2_ASSERT(!neighbors.isEmpty()); + DE_ASSERT(!neighbors.isEmpty()); QList boundaries; for (HEdge *base : neighbors) @@ -599,7 +599,7 @@ DENG2_PIMPL(ClientSubsector) // Map "this" subsector to the first outer subsector found. initBoundaryDataIfNeeded(); - DENG2_ASSERT(boundaryData->outerLoop); + DE_ASSERT(boundaryData->outerLoop); { ClEdgeLoop const &loop = *boundaryData->outerLoop; if (loop.hasBackSubsector()) @@ -1284,9 +1284,9 @@ DENG2_PIMPL(ClientSubsector) #if 0 /// Observes Sector LightLevelChange. - void sectorLightLevelChanged(Sector &DENG2_DEBUG_ONLY(changed)) + void sectorLightLevelChanged(Sector &DE_DEBUG_ONLY(changed)) { - DENG2_ASSERT(&changed == &self().sector()); + DE_ASSERT(&changed == &self().sector()); LOG_AS("ClientSubsector"); if (self().sector().map().hasLightGrid()) { @@ -1295,9 +1295,9 @@ DENG2_PIMPL(ClientSubsector) } /// Observes Sector LightColorChange. - void sectorLightColorChanged(Sector &DENG2_DEBUG_ONLY(changed)) + void sectorLightColorChanged(Sector &DE_DEBUG_ONLY(changed)) { - DENG2_ASSERT(&changed == &self().sector()); + DE_ASSERT(&changed == &self().sector()); LOG_AS("ClientSubsector"); if (self().sector().map().hasLightGrid()) { @@ -1446,7 +1446,7 @@ String ClientSubsector::description() const } } - DENG2_DEBUG_ONLY( + DE_DEBUG_ONLY( desc.prepend(String(_E(b) "ClientSubsector " _E(.) "[0x%1]\n").arg(de::dintptr(this), 0, 16)); ) return Subsector::description() + "\n" + desc; @@ -1460,7 +1460,7 @@ String ClientSubsector::edgeLoopIdAsText(dint loopId) // static case InnerLoop: return "inner"; default: - DENG2_ASSERT_FAIL("ClientSubsector::edgeLoopIdAsText: Invalid loopId"); + DE_ASSERT_FAIL("ClientSubsector::edgeLoopIdAsText: Invalid loopId"); throw Error("ClientSubsector::edgeLoopIdAsText", "Unknown loop ID " + QString::number(loopId)); } } @@ -1474,7 +1474,7 @@ dint ClientSubsector::edgeLoopCount() const LoopResult ClientSubsector::forAllEdgeLoops(const std::function &func) { d->initBoundaryDataIfNeeded(); - DENG2_ASSERT(bool(d->boundaryData->outerLoop)); + DE_ASSERT(bool(d->boundaryData->outerLoop)); { if (auto result = func(*d->boundaryData->outerLoop)) return result; @@ -1490,7 +1490,7 @@ LoopResult ClientSubsector::forAllEdgeLoops(const std::function &func) const { d->initBoundaryDataIfNeeded(); - DENG2_ASSERT(bool(d->boundaryData->outerLoop)); + DE_ASSERT(bool(d->boundaryData->outerLoop)); { if (auto result = func(*d->boundaryData->outerLoop)) return result; @@ -1695,11 +1695,11 @@ dint ClientSubsector::blockLightSourceZBias() #if 0 void ClientSubsector::applyBiasChanges(QBitArray &allChanges) { - DENG2_FOR_EACH(Impl::GeometryGroups, g, d->geomGroups) + DE_FOR_EACH(Impl::GeometryGroups, g, d->geomGroups) { for (Impl::GeometryData *gdata : g.value()) { - DENG2_ASSERT(bool(gdata->shard)); + DE_ASSERT(bool(gdata->shard)); gdata->shard->biasTracker().applyChanges(allChanges); } } @@ -1709,17 +1709,17 @@ void ClientSubsector::applyBiasChanges(QBitArray &allChanges) #if 0 // Determine the number of bias illumination points needed for this geometry. // Presently we define a 1:1 mapping to geometry vertices. -static dint countIlluminationPoints(MapElement &mapElement, dint DENG2_DEBUG_ONLY(group)) +static dint countIlluminationPoints(MapElement &mapElement, dint DE_DEBUG_ONLY(group)) { switch (mapElement.type()) { case DMU_SUBSPACE: { auto &space = mapElement.as(); - DENG2_ASSERT(group >= 0 && group < space.subsector().sector().planeCount()); // sanity check + DE_ASSERT(group >= 0 && group < space.subsector().sector().planeCount()); // sanity check return space.fanVertexCount(); } case DMU_SEGMENT: - DENG2_ASSERT(group >= 0 && group <= LineSide::Top); // sanity check + DE_ASSERT(group >= 0 && group <= LineSide::Top); // sanity check return 4; default: diff --git a/doomsday/apps/client/src/client/clplanemover.cpp b/doomsday/apps/client/src/client/clplanemover.cpp index 558cdd2f8a..6a86d12773 100644 --- a/doomsday/apps/client/src/client/clplanemover.cpp +++ b/doomsday/apps/client/src/client/clplanemover.cpp @@ -82,7 +82,7 @@ void ClPlaneMover::think() // Can we think yet? if (!Cl_GameReady()) return; - DENG2_ASSERT(_plane != 0); + DE_ASSERT(_plane != 0); // The move is cancelled if the consolePlayer becomes obstructed. bool const freeMove = ClPlayer_IsFreeToMove(consolePlayer); diff --git a/doomsday/apps/client/src/client/clskyplane.cpp b/doomsday/apps/client/src/client/clskyplane.cpp index de3d75c351..6a1435792d 100644 --- a/doomsday/apps/client/src/client/clskyplane.cpp +++ b/doomsday/apps/client/src/client/clskyplane.cpp @@ -23,7 +23,7 @@ using namespace de; namespace world { -DENG2_PIMPL_NOREF(ClSkyPlane) +DE_PIMPL_NOREF(ClSkyPlane) { bool isCeiling = false; ///< @c true if this is the ceiling; otherwise the floor. ddouble height = 0; @@ -32,10 +32,10 @@ DENG2_PIMPL_NOREF(ClSkyPlane) : isCeiling(ceiling), height(defaultHeight) {} - DENG2_PIMPL_AUDIENCE(HeightChange) + DE_PIMPL_AUDIENCE(HeightChange) }; -DENG2_AUDIENCE_METHOD(ClSkyPlane, HeightChange) +DE_AUDIENCE_METHOD(ClSkyPlane, HeightChange) ClSkyPlane::ClSkyPlane(bool isCeiling, ddouble defaultHeight) : d(new Impl(isCeiling, defaultHeight)) @@ -61,7 +61,7 @@ void ClSkyPlane::setHeight(ddouble newHeight) if (d->height != newHeight) { d->height = newHeight; - DENG2_FOR_AUDIENCE2(HeightChange, i) i->clSkyPlaneHeightChanged(*this); + DE_FOR_AUDIENCE2(HeightChange, i) i->clSkyPlaneHeightChanged(*this); } } diff --git a/doomsday/apps/client/src/clientapp.cpp b/doomsday/apps/client/src/clientapp.cpp index 90d1b00eeb..a6908bb3f0 100644 --- a/doomsday/apps/client/src/clientapp.cpp +++ b/doomsday/apps/client/src/clientapp.cpp @@ -114,13 +114,13 @@ static void continueInitWithEventLoopRunning() { if (!ClientWindowSystem::mainExists()) return; -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) // Show the main window. This causes initialization to finish (in busy mode) // as the canvas is visible and ready for initialization. ClientWindowSystem::main().show(); #endif -#if defined (DENG_HAVE_UPDATER) +#if defined (DE_HAVE_UPDATER) ClientApp::updater().setupUI(); #endif } @@ -144,20 +144,20 @@ static Value *Function_App_Quit(Context &, Function::ArgumentValues const &) return 0; } -DENG2_PIMPL(ClientApp) -, DENG2_OBSERVES(Plugins, PublishAPI) -, DENG2_OBSERVES(Plugins, Notification) -, DENG2_OBSERVES(Games, Progress) -, DENG2_OBSERVES(DoomsdayApp, GameChange) -, DENG2_OBSERVES(DoomsdayApp, GameUnload) -, DENG2_OBSERVES(DoomsdayApp, ConsoleRegistration) -, DENG2_OBSERVES(DoomsdayApp, PeriodicAutosave) +DE_PIMPL(ClientApp) +, DE_OBSERVES(Plugins, PublishAPI) +, DE_OBSERVES(Plugins, Notification) +, DE_OBSERVES(Games, Progress) +, DE_OBSERVES(DoomsdayApp, GameChange) +, DE_OBSERVES(DoomsdayApp, GameUnload) +, DE_OBSERVES(DoomsdayApp, ConsoleRegistration) +, DE_OBSERVES(DoomsdayApp, PeriodicAutosave) { Binder binder; -#if defined (DENG_HAVE_UPDATER) +#if defined (DE_HAVE_UPDATER) QScopedPointer updater; #endif -#if defined (DENG_HAVE_BUSYRUNNER) +#if defined (DE_HAVE_BUSYRUNNER) BusyRunner busyRunner; #endif ConfigProfiles audioSettings; @@ -270,10 +270,10 @@ DENG2_PIMPL(ClientApp) catch (Error const &er) { qWarning() << "Exception during ~ClientApp:" << er.asText(); - DENG2_ASSERT_FAIL("Unclean shutdown: exception in ~ClientApp"); + DE_ASSERT_FAIL("Unclean shutdown: exception in ~ClientApp"); } -#if defined (DENG_HAVE_UPDATER) +#if defined (DE_HAVE_UPDATER) updater.reset(); #endif delete inputSys; @@ -301,7 +301,7 @@ DENG2_PIMPL(ClientApp) // If an update has been downloaded and is ready to go, we should // re-show the dialog now that the user has saved the game as prompted. LOG_DEBUG("Game saved"); -#if defined (DENG_HAVE_UPDATER) +#if defined (DE_HAVE_UPDATER) UpdateDownloadDialog::showCompletedDownload(); #endif break; @@ -339,7 +339,7 @@ DENG2_PIMPL(ClientApp) void aboutToUnloadGame(Game const &/*gameBeingUnloaded*/) { - DENG_ASSERT(ClientWindow::mainExists()); + DE_ASSERT(ClientWindow::mainExists()); // Quit netGame if one is in progress. if (netGame) @@ -548,10 +548,10 @@ ClientApp::ClientApp(int &argc, char **argv) setGame(games().nullGame()); d->binder.init(scriptSystem()["App"]) - << DENG2_FUNC_NOARG (App_GamePlugin, "gamePlugin") - << DENG2_FUNC_NOARG (App_Quit, "quit"); + << DE_FUNC_NOARG (App_GamePlugin, "gamePlugin") + << DE_FUNC_NOARG (App_Quit, "quit"); -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) /// @todo Remove the splash screen when file system indexing can be done as /// a background task and the main window can be opened instantly. -jk QPixmap const pixmap(doomsdaySplashXpm); @@ -641,7 +641,7 @@ void ClientApp::initialize() WindowSystem::setAppWindowSystem(*d->winSys); addSystem(*d->winSys); -#if defined (DENG_HAVE_UPDATER) +#if defined (DE_HAVE_UPDATER) // Check for updates automatically. d->updater.reset(new Updater); #endif @@ -653,7 +653,7 @@ void ClientApp::initialize() plugins().loadAll(); // On mobile, the window is instantiated via QML. -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) d->winSys->createWindow()->setTitle(DD_ComposeMainWindowTitle()); #endif @@ -781,7 +781,7 @@ void ClientApp::gameSessionWasLoaded(AbstractSession const &session, { if (File const *file = fromFolder.tryLocate(d->mapClientStatePath(mapId))) { - DENG2_ASSERT(session.thinkerMapping() != nullptr); + DE_ASSERT(session.thinkerMapping() != nullptr); Reader reader(*file); world().map().deserializeInternalState(reader.withHeader(), @@ -852,19 +852,19 @@ void ClientApp::alert(String const &msg, LogEntry::Level level) ClientApp &ClientApp::app() { - DENG2_ASSERT(clientAppSingleton != 0); + DE_ASSERT(clientAppSingleton != 0); return *clientAppSingleton; } -#if defined (DENG_HAVE_UPDATER) +#if defined (DE_HAVE_UPDATER) Updater &ClientApp::updater() { - DENG2_ASSERT(!app().d->updater.isNull()); + DE_ASSERT(!app().d->updater.isNull()); return *app().d->updater; } #endif -#if defined (DENG_HAVE_BUSYRUNNER) +#if defined (DE_HAVE_BUSYRUNNER) BusyRunner &ClientApp::busyRunner() { return app().d->busyRunner; @@ -894,21 +894,21 @@ ConfigProfiles &ClientApp::uiSettings() ServerLink &ClientApp::serverLink() { ClientApp &a = ClientApp::app(); - DENG2_ASSERT(a.d->svLink != 0); + DE_ASSERT(a.d->svLink != 0); return *a.d->svLink; } InFineSystem &ClientApp::infineSystem() { ClientApp &a = ClientApp::app(); - //DENG2_ASSERT(a.d->infineSys != 0); + //DE_ASSERT(a.d->infineSys != 0); return a.d->infineSys; } InputSystem &ClientApp::inputSystem() { ClientApp &a = ClientApp::app(); - DENG2_ASSERT(a.d->inputSys != 0); + DE_ASSERT(a.d->inputSys != 0); return *a.d->inputSys; } @@ -920,7 +920,7 @@ bool ClientApp::hasInputSystem() RenderSystem &ClientApp::renderSystem() { ClientApp &a = ClientApp::app(); - DENG2_ASSERT(hasRenderSystem()); + DE_ASSERT(hasRenderSystem()); return *a.d->rendSys; } @@ -932,7 +932,7 @@ bool ClientApp::hasRenderSystem() AudioSystem &ClientApp::audioSystem() { ClientApp &a = ClientApp::app(); - DENG2_ASSERT(hasAudioSystem()); + DE_ASSERT(hasAudioSystem()); return *a.d->audioSys; } @@ -944,21 +944,21 @@ bool ClientApp::hasAudioSystem() ClientResources &ClientApp::resources() { ClientApp &a = ClientApp::app(); - DENG2_ASSERT(a.d->resources != 0); + DE_ASSERT(a.d->resources != 0); return *a.d->resources; } ClientWindowSystem &ClientApp::windowSystem() { ClientApp &a = ClientApp::app(); - DENG2_ASSERT(a.d->winSys != 0); + DE_ASSERT(a.d->winSys != 0); return *a.d->winSys; } ClientServerWorld &ClientApp::world() { ClientApp &a = ClientApp::app(); - DENG2_ASSERT(a.d->world != 0); + DE_ASSERT(a.d->world != 0); return *a.d->world; } @@ -969,7 +969,7 @@ void ClientApp::openHomepageInBrowser() void ClientApp::openInBrowser(QUrl url) { -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) // Get out of fullscreen mode. int windowed[] = { ClientWindow::Fullscreen, false, diff --git a/doomsday/apps/client/src/clientplayer.cpp b/doomsday/apps/client/src/clientplayer.cpp index 955873a3ab..2de795aaf9 100644 --- a/doomsday/apps/client/src/clientplayer.cpp +++ b/doomsday/apps/client/src/clientplayer.cpp @@ -26,8 +26,8 @@ using namespace de; -DENG2_PIMPL(ClientPlayer) -, DENG2_OBSERVES(World, MapChange) +DE_PIMPL(ClientPlayer) +, DE_OBSERVES(World, MapChange) { ViewCompositor viewCompositor; viewdata_t viewport; diff --git a/doomsday/apps/client/src/con_config.cpp b/doomsday/apps/client/src/con_config.cpp index c6c7d5c8cb..94cb31d230 100644 --- a/doomsday/apps/client/src/con_config.cpp +++ b/doomsday/apps/client/src/con_config.cpp @@ -80,10 +80,10 @@ static void writeHeaderComment(de::Writer &out) static int writeVariableToFileWorker(knownword_t const *word, void *context) { de::Writer *out = reinterpret_cast(context); - DENG_ASSERT(out != 0); + DE_ASSERT(out != 0); cvar_t *var = (cvar_t *)word->data; - DENG2_ASSERT(var != 0); + DE_ASSERT(var != 0); // Don't archive this cvar? if (var->flags & CVF_NO_ARCHIVE) @@ -140,10 +140,10 @@ static void writeVariablesToFile(de::Writer &out) static int writeAliasToFileWorker(knownword_t const *word, void *context) { de::Writer *out = reinterpret_cast(context); - DENG2_ASSERT(out != 0); + DE_ASSERT(out != 0); calias_t *cal = (calias_t *) word->data; - DENG2_ASSERT(cal != 0); + DE_ASSERT(cal != 0); out->writeText(String::format("alias \"%s\" \"%s\"\n", String(cal->name).escaped().toUtf8().constData(), @@ -237,7 +237,7 @@ static bool writeBindingsState(Path const &filePath) { ImpulseBinding bind(rec); PlayerImpulse const *impulse = P_PlayerImpulsePtr(rec.compiled().impulseId); - DENG2_ASSERT(impulse); + DE_ASSERT(impulse); out.writeText(String::format("bindcontrol local%i-%s \"%s\"\n", bind.geti("localPlayer") + 1, @@ -274,7 +274,7 @@ static bool writeState(Path const &filePath, Path const &bindingsFileName = "") writeBindingsState(bindingsFileName); } #else - DENG2_UNUSED(bindingsFileName); + DE_UNUSED(bindingsFileName); #endif return true; } @@ -341,7 +341,7 @@ void Con_SaveDefaultsIfChanged() D_CMD(WriteConsole) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); Path filePath(argv[1]); LOG_SCR_MSG("Writing to \"%s\"...") << filePath; diff --git a/doomsday/apps/client/src/configprofiles.cpp b/doomsday/apps/client/src/configprofiles.cpp index 6f7a2def35..0bb2867871 100644 --- a/doomsday/apps/client/src/configprofiles.cpp +++ b/doomsday/apps/client/src/configprofiles.cpp @@ -41,9 +41,9 @@ using namespace de; static String const CUSTOM_PROFILE = "Custom"; -DENG2_PIMPL(ConfigProfiles) -, DENG2_OBSERVES(DoomsdayApp, GameUnload) -, DENG2_OBSERVES(DoomsdayApp, GameChange) +DE_PIMPL(ConfigProfiles) +, DE_OBSERVES(DoomsdayApp, GameUnload) +, DE_OBSERVES(DoomsdayApp, GameChange) { struct Setting { @@ -124,9 +124,9 @@ DENG2_PIMPL(ConfigProfiles) QTextStream os(&info); os.setCodec("UTF-8"); - DENG2_FOR_EACH_CONST(Values, val, values) + DE_FOR_EACH_CONST(Values, val, values) { - DENG2_ASSERT(settings.contains(val.key())); + DE_ASSERT(settings.contains(val.key())); Setting const &st = settings[val.key()]; @@ -218,7 +218,7 @@ DENG2_PIMPL(ConfigProfiles) Record const &confDefaults = *proc.context().evaluator().result() .as().record(); - DENG2_ASSERT(confDefaults.has(name)); + DE_ASSERT(confDefaults.has(name)); Variable const &var = confDefaults[name]; if (is(var.value())) @@ -232,7 +232,7 @@ DENG2_PIMPL(ConfigProfiles) else { // Oops, we don't support this yet. - DENG2_ASSERT(false); + DE_ASSERT(false); } } catch (Error const &er) @@ -309,7 +309,7 @@ DENG2_PIMPL(ConfigProfiles) void changeTo(String const &profileName) { LOG_AS("ConfigProfiles"); - DENG2_ASSERT(tryFind(profileName)); + DE_ASSERT(tryFind(profileName)); if (current == profileName) return; @@ -325,7 +325,7 @@ DENG2_PIMPL(ConfigProfiles) setCurrent(profileName); apply(current); - DENG2_FOR_PUBLIC_AUDIENCE(ProfileChange, i) + DE_FOR_PUBLIC_AUDIENCE(ProfileChange, i) { i->currentProfileChanged(profileName); } @@ -341,8 +341,8 @@ DENG2_PIMPL(ConfigProfiles) void resetSetting(String const &settingName) const { - DENG2_ASSERT(settings.contains(settingName)); - DENG2_ASSERT(defaults.values.contains(settingName)); + DE_ASSERT(settings.contains(settingName)); + DE_ASSERT(defaults.values.contains(settingName)); settings[settingName].setValue(defaults.values[settingName]); } @@ -359,7 +359,7 @@ DENG2_PIMPL(ConfigProfiles) QVariant textToSettingValue(String const &text, String const &settingName) const { - DENG2_ASSERT(settings.contains(settingName)); + DE_ASSERT(settings.contains(settingName)); Setting const &st = settings[settingName]; @@ -378,7 +378,7 @@ DENG2_PIMPL(ConfigProfiles) return text.toDouble(); } - DENG2_ASSERT(false); + DE_ASSERT(false); return QVariant(); } @@ -512,7 +512,7 @@ void ConfigProfiles::resetToDefaults() { d->reset(); - DENG2_FOR_AUDIENCE(ProfileChange, i) + DE_FOR_AUDIENCE(ProfileChange, i) { i->currentProfileChanged(d->current); } @@ -529,7 +529,7 @@ bool ConfigProfiles::rename(String const &name) { d->setCurrent(name); - DENG2_FOR_AUDIENCE(ProfileChange, i) + DE_FOR_AUDIENCE(ProfileChange, i) { i->currentProfileChanged(name); } diff --git a/doomsday/apps/client/src/dd_loop.cpp b/doomsday/apps/client/src/dd_loop.cpp index cfa3874c1a..aab47ea0e3 100644 --- a/doomsday/apps/client/src/dd_loop.cpp +++ b/doomsday/apps/client/src/dd_loop.cpp @@ -52,7 +52,7 @@ using namespace de; // Development utility: on sharp tics, print player 0 movement state. -//#define LIBDENG_PLAYER0_MOVEMENT_ANALYSIS +//#define DE_PLAYER0_MOVEMENT_ANALYSIS /** * There needs to be at least this many tics per second. A smaller value @@ -119,7 +119,7 @@ dfloat DD_GetFrameRate() } #undef DD_IsSharpTick -DENG_EXTERN_C dd_bool DD_IsSharpTick() +DE_EXTERN_C dd_bool DD_IsSharpTick() { return ::tickIsSharp; } @@ -203,7 +203,7 @@ static void baseTicker(timespan_t time) R_NewSharpWorld(); #endif -#ifdef LIBDENG_PLAYER0_MOVEMENT_ANALYSIS +#ifdef DE_PLAYER0_MOVEMENT_ANALYSIS if(DD_Player(0)->publicData().inGame && DD_Player(0)->publicData().mo) { static coord_t prevPos[3] = { 0, 0, 0 }; diff --git a/doomsday/apps/client/src/dd_main.cpp b/doomsday/apps/client/src/dd_main.cpp index 17f988ad10..99799df0df 100644 --- a/doomsday/apps/client/src/dd_main.cpp +++ b/doomsday/apps/client/src/dd_main.cpp @@ -22,7 +22,7 @@ * 02110-1301 USA */ -#define DENG_NO_API_MACROS_BASE // functions defined here +#define DE_NO_API_MACROS_BASE // functions defined here #include "de_platform.h" #include "dd_main.h" @@ -514,7 +514,7 @@ void App_Error(char const *error, ...) dd_vsnprintf(buff, sizeof(buff), error, argptr); va_end(argptr); -#if defined (__CLIENT__) && defined (DENG_HAVE_BUSYRUNNER) +#if defined (__CLIENT__) && defined (DE_HAVE_BUSYRUNNER) if (!ClientApp::busyRunner().inWorkerThread()) { Sys_MessageBox(MBT_ERROR, DOOMSDAY_NICENAME, buff, 0); @@ -546,7 +546,7 @@ void App_Error(char const *error, ...) { DoomsdayApp::app().busyMode().abort(buff); -#if defined (__CLIENT__) && defined (DENG_HAVE_BUSYRUNNER) +#if defined (__CLIENT__) && defined (DE_HAVE_BUSYRUNNER) if (ClientApp::busyRunner().inWorkerThread()) { // We should not continue to execute the worker any more. @@ -564,7 +564,7 @@ void App_Error(char const *error, ...) void App_AbnormalShutdown(char const *message) { - DENG2_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_IN_MAIN_THREAD(); #ifdef __CLIENT__ // This is a crash landing, better be safe than sorry. @@ -575,7 +575,7 @@ void App_AbnormalShutdown(char const *message) #ifdef __CLIENT__ DisplayMode_Shutdown(); - DENG2_GUI_APP->loop().pause(); + DE_GUI_APP->loop().pause(); // This is an abnormal shutdown, we cannot continue drawing any of the // windows. (Alternatively could hide/disable drawing of the windows.) Note @@ -673,7 +673,7 @@ void Con_Open(dint yes) #endif #ifdef __SERVER__ - DENG2_UNUSED(yes); + DE_UNUSED(yes); #endif } @@ -684,7 +684,7 @@ void Con_Open(dint yes) */ D_CMD(OpenClose) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); if (!stricmp(argv[0], "conopen")) { @@ -703,7 +703,7 @@ D_CMD(OpenClose) D_CMD(TaskBar) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); ClientWindow &win = ClientWindow::main(); if (!win.taskBar().isOpen() || !win.console().commandLine().hasFocus()) @@ -720,7 +720,7 @@ D_CMD(TaskBar) D_CMD(PackagesSidebar) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); if (!DoomsdayApp::isGameLoaded()) return false; @@ -738,7 +738,7 @@ D_CMD(PackagesSidebar) D_CMD(Tutorial) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); ClientWindow::main().taskBar().showTutorial(); return true; } @@ -772,7 +772,7 @@ int DD_ActivateGameWorker(void *context) if (gx.PreInit) { - DENG2_ASSERT(App_CurrentGame().pluginId() != 0); + DE_ASSERT(App_CurrentGame().pluginId() != 0); plugins.setActivePluginId(App_CurrentGame().pluginId()); gx.PreInit(App_CurrentGame().id().toUtf8()); @@ -1017,7 +1017,7 @@ dint DD_EarlyInit() } // Perform basic runtime type size checks. -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG static void assertTypeSizes() { void *ptr = 0; @@ -1025,10 +1025,10 @@ static void assertTypeSizes() int16_t int16 = 0; dfloat float32 = 0; - DENG2_UNUSED(ptr); - DENG2_UNUSED(int32); - DENG2_UNUSED(int16); - DENG2_UNUSED(float32); + DE_UNUSED(ptr); + DE_UNUSED(int32); + DE_UNUSED(int16); + DE_UNUSED(float32); ASSERT_32BIT(int32); ASSERT_16BIT(int16); @@ -1048,7 +1048,7 @@ static void assertTypeSizes() */ static void initializeWithWindowReady() { - DENG2_DEBUG_ONLY( assertTypeSizes(); ) + DE_DEBUG_ONLY( assertTypeSizes(); ) static char const *AUTOEXEC_NAME = "autoexec.cfg"; @@ -1366,8 +1366,8 @@ static dint DD_StartupWorker(void * /*context*/) RLF_DEFAULT, App_ResourceClass(RC_PACKAGE)); foundPath = App_BasePath() / foundPath; // Ensure the path is absolute. File1 *loadedFile = File1::tryLoad(de::makeUri(foundPath)); - DENG2_ASSERT(loadedFile); - DENG2_UNUSED(loadedFile);*/ + DE_ASSERT(loadedFile); + DE_UNUSED(loadedFile);*/ // It is assumed that doomsday.pk3 is currently stored in a native file. if (File const *basePack = App::packageLoader().select("net.dengine.legacy.base")) @@ -1465,7 +1465,7 @@ void DD_CheckTimeDemo() static dint DD_UpdateEngineStateWorker(void *context) { - DENG2_ASSERT(context); + DE_ASSERT(context); auto const initiatedBusyMode = *static_cast(context); #ifdef __CLIENT__ @@ -1513,7 +1513,7 @@ static dint DD_UpdateEngineStateWorker(void *context) /// @todo fixme: Update the game title and the status. -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG Z_CheckHeap(); #endif @@ -1658,10 +1658,10 @@ dint DD_GetInteger(dint ddvalue) return dint( ClientApp::inputSystem().shiftDown() ); case DD_WINDOW_WIDTH: - return DENG_GAMEVIEW_WIDTH; + return DE_GAMEVIEW_WIDTH; case DD_WINDOW_HEIGHT: - return DENG_GAMEVIEW_HEIGHT; + return DE_GAMEVIEW_HEIGHT; case DD_CURRENT_CLIENT_FINALE_ID: return Cl_CurrentFinale(); @@ -1964,7 +1964,7 @@ AutoStr *DD_MaterialSchemeNameForTextureScheme(ddstring_t const *textureSchemeNa D_CMD(Load) { - DENG2_UNUSED(src); + DE_UNUSED(src); BusyMode_FreezeGameForBusyMode(); auto &loader = PackageLoader::get(); @@ -2075,7 +2075,7 @@ D_CMD(Load) D_CMD(Unload) { - DENG2_UNUSED(src); + DE_UNUSED(src); BusyMode_FreezeGameForBusyMode(); DoomsdayApp &app = DoomsdayApp::app(); @@ -2199,7 +2199,7 @@ D_CMD(Unload) D_CMD(Reset) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); DD_UpdateEngineState(); return true; @@ -2207,7 +2207,7 @@ D_CMD(Reset) D_CMD(ReloadGame) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); if (!DoomsdayApp::currentGameProfile()) { @@ -2220,11 +2220,11 @@ D_CMD(ReloadGame) return true; } -#if defined (DENG_HAVE_UPDATER) +#if defined (DE_HAVE_UPDATER) D_CMD(CheckForUpdates) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); LOG_MSG("Checking for available updates..."); ClientApp::updater().checkNow(Updater::OnlyShowResultIfUpdateAvailable); @@ -2233,7 +2233,7 @@ D_CMD(CheckForUpdates) D_CMD(CheckForUpdatesAndNotify) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); LOG_MSG("Checking for available updates..."); ClientApp::updater().checkNow(Updater::AlwaysShowResult); @@ -2242,7 +2242,7 @@ D_CMD(CheckForUpdatesAndNotify) D_CMD(LastUpdated) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); ClientApp::updater().printLastUpdated(); return true; @@ -2250,17 +2250,17 @@ D_CMD(LastUpdated) D_CMD(ShowUpdateSettings) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); ClientApp::updater().showSettings(); return true; } -#endif // DENG_HAVE_UPDATER +#endif // DE_HAVE_UPDATER D_CMD(Version) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); LOG_SCR_NOTE(_E(D) DOOMSDAY_NICENAME " %s") << Version::currentBuild().asHumanReadableText(); LOG_SCR_MSG(_E(l) "Homepage: " _E(.) _E(i) DOOMSDAY_HOMEURL _E(.) @@ -2283,9 +2283,9 @@ D_CMD(Version) D_CMD(Quit) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); -#if defined (DENG_HAVE_UPDATER) +#if defined (DE_HAVE_UPDATER) if (UpdateDownloadDialog::isDownloadInProgress()) { LOG_WARNING("Cannot quit while downloading an update"); @@ -2316,7 +2316,7 @@ D_CMD(Quit) #ifdef _DEBUG D_CMD(DebugError) { - DENG2_UNUSED3(src, argv, argc); + DE_UNUSED(src, argv, argc); App_Error("Fatal error!\n"); return true; @@ -2325,7 +2325,7 @@ D_CMD(DebugError) D_CMD(Help) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); /* #ifdef __CLIENT__ @@ -2341,14 +2341,14 @@ D_CMD(Help) #ifdef __CLIENT__ LOG_SCR_MSG(_E(D) "Keys:" _E(.)) - << TABBED(DENG2_CHAR_SHIFT_KEY "Esc", "Open the taskbar and console") + << TABBED(DE_CHAR_SHIFT_KEY "Esc", "Open the taskbar and console") << TABBED("Tab", "Autocomplete the word at the cursor") - << TABBED(DENG2_CHAR_UP_DOWN_ARROW, "Move backwards/forwards through the input command history, or up/down one line inside a multi-line command") + << TABBED(DE_CHAR_UP_DOWN_ARROW, "Move backwards/forwards through the input command history, or up/down one line inside a multi-line command") << TABBED("PgUp/Dn", "Scroll up/down in the history, or expand the history to full height") - << TABBED(DENG2_CHAR_SHIFT_KEY "PgUp/Dn", "Jump to the top/bottom of the history") + << TABBED(DE_CHAR_SHIFT_KEY "PgUp/Dn", "Jump to the top/bottom of the history") << TABBED("Home", "Move the cursor to the start of the command line") << TABBED("End", "Move the cursor to the end of the command line") - << TABBED(DENG2_CHAR_CONTROL_KEY "K", "Clear everything on the line right of the cursor position") + << TABBED(DE_CHAR_CONTROL_KEY "K", "Clear everything on the line right of the cursor position") << TABBED("F5", "Clear the console message history"); #endif LOG_SCR_MSG(_E(D) "Getting started:"); @@ -2427,7 +2427,7 @@ static void printHelpAbout(char const *query) D_CMD(HelpWhat) { - DENG2_UNUSED2(argc, src); + DE_UNUSED(argc, src); if (!String(argv[1]).compareWithoutCase("(what)")) { @@ -2442,7 +2442,7 @@ D_CMD(HelpWhat) #ifdef __CLIENT__ D_CMD(Clear) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); ClientWindow::main().console().clearLog(); return true; @@ -2464,7 +2464,7 @@ void DD_ConsoleRegister() C_CMD("unload", "*", Unload); C_CMD("write", "s", WriteConsole); -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG C_CMD("fatalerror", nullptr, DebugError); #endif @@ -2479,7 +2479,7 @@ void DD_ConsoleRegister() #ifdef __CLIENT__ C_CMD("clear", "", Clear); -#if defined (DENG_HAVE_UPDATER) +#if defined (DE_HAVE_UPDATER) C_CMD("update", "", CheckForUpdates); C_CMD("updateandnotify", "", CheckForUpdatesAndNotify); C_CMD("updatesettings", "", ShowUpdateSettings); @@ -2519,15 +2519,15 @@ void DD_ConsoleRegister() } // dd_loop.c -DENG_EXTERN_C dd_bool DD_IsSharpTick(void); +DE_EXTERN_C dd_bool DD_IsSharpTick(void); // net_main.c -DENG_EXTERN_C void Net_SendPacket(dint to_player, dint type, const void* data, size_t length); +DE_EXTERN_C void Net_SendPacket(dint to_player, dint type, const void* data, size_t length); #undef R_SetupMap -DENG_EXTERN_C void R_SetupMap(dint mode, dint flags) +DE_EXTERN_C void R_SetupMap(dint mode, dint flags) { - DENG2_UNUSED2(mode, flags); + DE_UNUSED(mode, flags); if (!App_World().hasMap()) return; // Huh? @@ -2564,9 +2564,9 @@ DENG_EXTERN_C void R_SetupMap(dint mode, dint flags) } // sys_system.c -DENG_EXTERN_C void Sys_Quit(); +DE_EXTERN_C void Sys_Quit(); -DENG_DECLARE_API(Base) = +DE_DECLARE_API(Base) = { { DE_API_BASE }, diff --git a/doomsday/apps/client/src/dd_pinit.cpp b/doomsday/apps/client/src/dd_pinit.cpp index ab00944094..9e69f3e5fa 100644 --- a/doomsday/apps/client/src/dd_pinit.cpp +++ b/doomsday/apps/client/src/dd_pinit.cpp @@ -72,7 +72,7 @@ using namespace de; /* * The game imports and exports. */ -DENG_DECLARE_API(InternalData) = +DE_DECLARE_API(InternalData) = { { DE_API_INTERNAL_DATA }, runtimeDefs.mobjInfo.elementsPtr(), @@ -101,7 +101,7 @@ void DD_PublishAPIs(::Library *lib) if(library.hasSymbol("deng_API")) { - de::Library::deng_API setAPI = library.DENG2_SYMBOL(deng_API); + de::Library::deng_API setAPI = library.DE_SYMBOL(deng_API); #define PUBLISH(X) setAPI(X.api.id, &X) diff --git a/doomsday/apps/client/src/def_main.cpp b/doomsday/apps/client/src/def_main.cpp index 153317d9fe..40ee675bb1 100644 --- a/doomsday/apps/client/src/def_main.cpp +++ b/doomsday/apps/client/src/def_main.cpp @@ -19,7 +19,7 @@ * 02110-1301 USA */ -#define DENG_NO_API_MACROS_DEFINITIONS +#define DE_NO_API_MACROS_DEFINITIONS #include "def_main.h" @@ -111,21 +111,21 @@ void Def_Init() App::app().scriptSystem().addNativeModule("Defs", defs.names); // Constants for definitions. - DENG2_ADD_NUMBER_CONSTANT(defs.names, SN_SPAWN); - DENG2_ADD_NUMBER_CONSTANT(defs.names, SN_SEE); - DENG2_ADD_NUMBER_CONSTANT(defs.names, SN_PAIN); - DENG2_ADD_NUMBER_CONSTANT(defs.names, SN_MELEE); - DENG2_ADD_NUMBER_CONSTANT(defs.names, SN_MISSILE); - DENG2_ADD_NUMBER_CONSTANT(defs.names, SN_CRASH); - DENG2_ADD_NUMBER_CONSTANT(defs.names, SN_DEATH); - DENG2_ADD_NUMBER_CONSTANT(defs.names, SN_XDEATH); - DENG2_ADD_NUMBER_CONSTANT(defs.names, SN_RAISE); - - DENG2_ADD_NUMBER_CONSTANT(defs.names, SDN_ACTIVE); - DENG2_ADD_NUMBER_CONSTANT(defs.names, SDN_ATTACK); - DENG2_ADD_NUMBER_CONSTANT(defs.names, SDN_DEATH); - DENG2_ADD_NUMBER_CONSTANT(defs.names, SDN_PAIN); - DENG2_ADD_NUMBER_CONSTANT(defs.names, SDN_SEE); + DE_ADD_NUMBER_CONSTANT(defs.names, SN_SPAWN); + DE_ADD_NUMBER_CONSTANT(defs.names, SN_SEE); + DE_ADD_NUMBER_CONSTANT(defs.names, SN_PAIN); + DE_ADD_NUMBER_CONSTANT(defs.names, SN_MELEE); + DE_ADD_NUMBER_CONSTANT(defs.names, SN_MISSILE); + DE_ADD_NUMBER_CONSTANT(defs.names, SN_CRASH); + DE_ADD_NUMBER_CONSTANT(defs.names, SN_DEATH); + DE_ADD_NUMBER_CONSTANT(defs.names, SN_XDEATH); + DE_ADD_NUMBER_CONSTANT(defs.names, SN_RAISE); + + DE_ADD_NUMBER_CONSTANT(defs.names, SDN_ACTIVE); + DE_ADD_NUMBER_CONSTANT(defs.names, SDN_ATTACK); + DE_ADD_NUMBER_CONSTANT(defs.names, SDN_DEATH); + DE_ADD_NUMBER_CONSTANT(defs.names, SDN_PAIN); + DE_ADD_NUMBER_CONSTANT(defs.names, SDN_SEE); } void Def_Destroy() @@ -172,7 +172,7 @@ sfxinfo_t *Def_GetSoundInfo(dint soundId, dfloat *freq, dfloat *volume) ++i) {} - DENG2_ASSERT(soundId < DED_Definitions()->sounds.size()); + DE_ASSERT(soundId < DED_Definitions()->sounds.size()); return info; } @@ -314,7 +314,7 @@ ded_ptcgen_t *Def_GetDamageGenerator(int mobjType) */ static void Def_InitTextDef(ddtext_t *txt, char const *str) { - DENG2_ASSERT(txt); + DE_ASSERT(txt); // Handle null pointers with "". if (!str) str = ""; @@ -370,7 +370,7 @@ static void Def_ReadLumpDefs() LumpIndex const &lumpIndex = fileSys().nameIndex(); LumpIndex::FoundIndices foundDefns; lumpIndex.findAll("DD_DEFNS.lmp", foundDefns); - DENG2_FOR_EACH_CONST(LumpIndex::FoundIndices, i, foundDefns) + DE_FOR_EACH_CONST(LumpIndex::FoundIndices, i, foundDefns) { if (!DED_ReadLump(DED_Definitions(), *i)) { @@ -430,7 +430,7 @@ static void readDefinitionFile(String path) */ static void prependWorkPath(ddstring_t *dst, ddstring_t const *src) { - DENG2_ASSERT(dst && src); + DE_ASSERT(dst && src); if (!F_IsAbsolute(src)) { @@ -856,7 +856,7 @@ static void redecorateMaterial(ClientMaterial &material, Record const &def) for (dint k = 0; k < mainDef.lightCount(); ++k) { defn::MaterialDecoration decorDef(mainDef.light(k)); - DENG2_ASSERT(decorDef.stageCount() == 1); // sanity check. + DE_ASSERT(decorDef.stageCount() == 1); // sanity check. std::unique_ptr decor( new LightMaterialDecoration(Vec2i(decorDef.geta("patternSkip")), @@ -1705,7 +1705,7 @@ String Def_GetStateName(state_t const *state) { if (!state) return "(nullptr)"; dint const idx = ::runtimeDefs.states.indexOf(state); - DENG2_ASSERT(idx >= 0); + DE_ASSERT(idx >= 0); return DED_Definitions()->states[idx].gets("id"); } @@ -1720,7 +1720,7 @@ static inline dint Friendly(dint num) */ void Def_CopyLineType(linetype_t *l, ded_linetype_t *def) { - DENG2_ASSERT(l && def); + DE_ASSERT(l && def); l->id = def->id; l->flags = def->flags[0]; @@ -1841,7 +1841,7 @@ void Def_CopyLineType(linetype_t *l, ded_linetype_t *def) */ void Def_CopySectorType(sectortype_t *s, ded_sectortype_t *def) { - DENG2_ASSERT(s && def); + DE_ASSERT(s && def); dint i, k; s->id = def->id; @@ -1937,7 +1937,7 @@ dint Def_Set(dint type, dint index, dint value, void const *ptr) case DD_DEF_SOUND: if (index < 0 || index >= ::runtimeDefs.sounds.size()) { - DENG2_ASSERT_FAIL("Sound index is invalid"); + DE_ASSERT_FAIL("Sound index is invalid"); return false; } @@ -1977,7 +1977,7 @@ dint Def_Set(dint type, dint index, dint value, void const *ptr) */ D_CMD(ListMobjs) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); if (DED_Definitions()->things.size() <= 0) { @@ -2003,7 +2003,7 @@ void Def_ConsoleRegister() C_CMD("listmobjtypes", "", ListMobjs); } -DENG_DECLARE_API(Def) = +DE_DECLARE_API(Def) = { { DE_API_DEFINITIONS }, diff --git a/doomsday/apps/client/src/gl/dgl_common.cpp b/doomsday/apps/client/src/gl/dgl_common.cpp index 1b97739ceb..6bb5bf3906 100644 --- a/doomsday/apps/client/src/gl/dgl_common.cpp +++ b/doomsday/apps/client/src/gl/dgl_common.cpp @@ -17,7 +17,7 @@ * http://www.gnu.org/licenses */ -#define DENG_NO_API_MACROS_GL +#define DE_NO_API_MACROS_GL #include "de_base.h" #include "gl/gl_main.h" @@ -82,7 +82,7 @@ struct DGLState default: { int const index = int(id) - DGL_MODELVIEW; - DENG2_ASSERT(index >= 0 && index < 2); + DE_ASSERT(index >= 0 && index < 2); return index; } } } @@ -96,21 +96,21 @@ struct DGLState void popMatrix() { auto &stack = matrixStacks[matrixMode]; - DENG2_ASSERT(stack.size() > 1); + DE_ASSERT(stack.size() > 1); stack.pop_back(); } void loadMatrix(Mat4f const &mat) { auto &stack = matrixStacks[matrixMode]; - DENG2_ASSERT(!stack.isEmpty()); + DE_ASSERT(!stack.isEmpty()); stack.back() = mat; } void multMatrix(Mat4f const &mat) { auto &stack = matrixStacks[matrixMode]; - DENG2_ASSERT(!stack.isEmpty()); + DE_ASSERT(!stack.isEmpty()); stack.back() = stack.back() * mat; } }; @@ -204,8 +204,8 @@ void DGL_CullFace(DGLenum cull) */ static void envAddColoredAlpha(int activate, GLenum addFactor) { - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); if(activate) { @@ -258,8 +258,8 @@ static void envAddColoredAlpha(int activate, GLenum addFactor) */ static void envModMultiTex(int activate) { - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); // Setup TU 2: The modulated texture. LIBGUI_GL.glActiveTexture(GL_TEXTURE1); @@ -306,8 +306,8 @@ void DGL_ModulateTexture(int mode) } #if 0 - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); switch(mode) { @@ -497,8 +497,8 @@ void DGL_ModulateTexture(int mode) if(!GL_state.features.blendSubtract) return; - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); LIBGUI_GL.glBlendEquationEXT(op); }*/ @@ -512,18 +512,18 @@ void GL_SetVSync(dd_bool on) return; } - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); GLInfo::setSwapInterval(on ? 1 : 0); } #undef DGL_SetScissor -DENG_EXTERN_C void DGL_SetScissor(RectRaw const *rect) +DE_EXTERN_C void DGL_SetScissor(RectRaw const *rect) { if(!rect) return; - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); GameWidget &game = ClientWindow::main().game(); @@ -541,7 +541,7 @@ DENG_EXTERN_C void DGL_SetScissor(RectRaw const *rect) } #undef DGL_SetScissor2 -DENG_EXTERN_C void DGL_SetScissor2(int x, int y, int width, int height) +DE_EXTERN_C void DGL_SetScissor2(int x, int y, int width, int height) { RectRaw rect; rect.origin.x = x; @@ -554,8 +554,8 @@ DENG_EXTERN_C void DGL_SetScissor2(int x, int y, int width, int height) #undef DGL_GetIntegerv dd_bool DGL_GetIntegerv(int name, int *v) { - //DENG_ASSERT_IN_MAIN_THREAD(); - //DENG_ASSERT_GL_CONTEXT_ACTIVE(); + //DE_ASSERT_IN_MAIN_THREAD(); + //DE_ASSERT_GL_CONTEXT_ACTIVE(); float color[4]; switch(name) @@ -650,9 +650,9 @@ dd_bool DGL_SetInteger(int name, int value) switch(name) { case DGL_ACTIVE_TEXTURE: - DENG_ASSERT_GL_CONTEXT_ACTIVE(); - DENG2_ASSERT(value >= 0); - DENG2_ASSERT(value < MAX_TEX_UNITS); + DE_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT(value >= 0); + DE_ASSERT(value < MAX_TEX_UNITS); dgl.activeTexture = value; LIBGUI_GL.glActiveTexture(GLenum(GL_TEXTURE0 + value)); break; @@ -675,8 +675,8 @@ dd_bool DGL_SetInteger(int name, int value) #undef DGL_GetFloatv dd_bool DGL_GetFloatv(int name, float *v) { - //DENG_ASSERT_IN_MAIN_THREAD(); - //DENG_ASSERT_GL_CONTEXT_ACTIVE(); + //DE_ASSERT_IN_MAIN_THREAD(); + //DE_ASSERT_GL_CONTEXT_ACTIVE(); float color[4]; switch (name) @@ -762,7 +762,7 @@ dd_bool DGL_SetFloat(int name, float value) case DGL_POINT_SIZE: GL_state.currentPointSize = value; -#if defined (DENG_OPENGL) +#if defined (DE_OPENGL) LIBGUI_ASSERT_GL_CONTEXT_ACTIVE(); LIBGUI_GL.glPointSize(value); #endif @@ -797,7 +797,8 @@ void DGL_PopState(void) #undef DGL_Enable int DGL_Enable(int cap) { - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + //DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); switch (cap) { @@ -855,7 +856,7 @@ int DGL_Enable(int cap) break; case DGL_LINE_SMOOTH: -#if defined(DENG_OPENGL) +#if defined(DE_OPENGL) Deferred_glEnable(GL_LINE_SMOOTH); #endif break; @@ -866,7 +867,7 @@ int DGL_Enable(int cap) break; default: - DENG_ASSERT_FAIL("DGL_Enable: Invalid cap"); + DE_ASSERT_FAIL("DGL_Enable: Invalid cap"); return 0; } @@ -877,7 +878,8 @@ int DGL_Enable(int cap) #undef DGL_Disable void DGL_Disable(int cap) { - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + //DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); switch (cap) { @@ -936,19 +938,19 @@ void DGL_Disable(int cap) break; case DGL_LINE_SMOOTH: -#if defined(DENG_OPENGL) +#if defined(DE_OPENGL) Deferred_glDisable(GL_LINE_SMOOTH); #endif break; case DGL_POINT_SMOOTH: -#if defined(DENG_OPENGL) +#if defined(DE_OPENGL) Deferred_glDisable(GL_POINT_SMOOTH); #endif break; default: - DENG2_ASSERT_FAIL("DGL_Disable: Invalid cap"); + DE_ASSERT_FAIL("DGL_Disable: Invalid cap"); break; } @@ -971,8 +973,8 @@ void DGL_BlendOp(int op) #undef DGL_BlendFunc void DGL_BlendFunc(int param1, int param2) { - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); const auto src = param1 == DGL_ZERO ? gl::Zero : param1 == DGL_ONE ? gl::One : @@ -1026,7 +1028,7 @@ static gl::Wrapping DGL_ToGLWrapCap(DGLint cap) return gl::Repeat; default: - DENG2_ASSERT_FAIL("DGL_ToGLWrapCap: Unknown cap value"); + DE_ASSERT_FAIL("DGL_ToGLWrapCap: Unknown cap value"); break; } return gl::ClampToEdge; @@ -1083,7 +1085,7 @@ void DGL_SetRawImage(lumpnum_t lumpNum, DGLint wrapS, DGLint wrapT) #undef DGL_MatrixMode void DGL_MatrixMode(DGLenum mode) { - //DENG2_ASSERT_IN_RENDER_THREAD(); + //DE_ASSERT_IN_RENDER_THREAD(); dgl.matrixMode = dgl.stackIndex(mode); } @@ -1091,7 +1093,7 @@ void DGL_MatrixMode(DGLenum mode) #undef DGL_PushMatrix void DGL_PushMatrix(void) { - //DENG2_ASSERT_IN_RENDER_THREAD(); + //DE_ASSERT_IN_RENDER_THREAD(); dgl.pushMatrix(); } @@ -1099,7 +1101,7 @@ void DGL_PushMatrix(void) #undef DGL_PopMatrix void DGL_PopMatrix(void) { - //DENG2_ASSERT_IN_RENDER_THREAD(); + //DE_ASSERT_IN_RENDER_THREAD(); dgl.popMatrix(); } @@ -1107,7 +1109,7 @@ void DGL_PopMatrix(void) #undef DGL_LoadIdentity void DGL_LoadIdentity(void) { - //DENG2_ASSERT_IN_RENDER_THREAD(); + //DE_ASSERT_IN_RENDER_THREAD(); dgl.loadMatrix(Mat4f()); } @@ -1115,7 +1117,7 @@ void DGL_LoadIdentity(void) #undef DGL_LoadMatrix void DGL_LoadMatrix(float const *matrix4x4) { - //DENG2_ASSERT_IN_RENDER_THREAD(); + //DE_ASSERT_IN_RENDER_THREAD(); dgl.loadMatrix(Mat4f(matrix4x4)); } @@ -1123,7 +1125,7 @@ void DGL_LoadMatrix(float const *matrix4x4) #undef DGL_Translatef void DGL_Translatef(float x, float y, float z) { - //DENG2_ASSERT_IN_RENDER_THREAD(); + //DE_ASSERT_IN_RENDER_THREAD(); dgl.multMatrix(Mat4f::translate(Vec3f(x, y, z))); } @@ -1131,7 +1133,7 @@ void DGL_Translatef(float x, float y, float z) #undef DGL_Rotatef void DGL_Rotatef(float angle, float x, float y, float z) { - //DENG2_ASSERT_IN_RENDER_THREAD(); + //DE_ASSERT_IN_RENDER_THREAD(); dgl.multMatrix(Mat4f::rotate(angle, Vec3f(x, y, z))); } @@ -1139,7 +1141,7 @@ void DGL_Rotatef(float angle, float x, float y, float z) #undef DGL_Scalef void DGL_Scalef(float x, float y, float z) { - //DENG2_ASSERT_IN_RENDER_THREAD(); + //DE_ASSERT_IN_RENDER_THREAD(); dgl.multMatrix(Mat4f::scale(Vec3f(x, y, z))); } @@ -1147,7 +1149,7 @@ void DGL_Scalef(float x, float y, float z) #undef DGL_Ortho void DGL_Ortho(float left, float top, float right, float bottom, float znear, float zfar) { - //DENG2_ASSERT_IN_RENDER_THREAD(); + //DE_ASSERT_IN_RENDER_THREAD(); dgl.multMatrix(Mat4f::ortho(left, right, top, bottom, znear, zfar)); } @@ -1204,7 +1206,7 @@ void DGL_DeleteTextures(int num, DGLuint const *names) int DGL_Bind(DGLuint texture) { GL_BindTextureUnmanaged(texture); - DENG_ASSERT(!Sys_GLCheckError()); + DE_ASSERT(!Sys_GLCheckError()); return 0; } @@ -1213,7 +1215,7 @@ DGLuint DGL_NewTextureWithParams(dgltexformat_t format, int width, int height, uint8_t const *pixels, int flags, int minFilter, int magFilter, int anisoFilter, int wrapS, int wrapT) { -#if defined (DENG_OPENGL_ES) +#if defined (DE_OPENGL_ES) # define GL_CLAMP GL_CLAMP_TO_EDGE #endif return GL_NewTextureWithParams(format, width, height, (uint8_t *)pixels, flags, 0, @@ -1229,54 +1231,54 @@ DGLuint DGL_NewTextureWithParams(dgltexformat_t format, int width, int height, wrapS == DGL_CLAMP_TO_EDGE ? GL_CLAMP_TO_EDGE : GL_REPEAT), (wrapT == DGL_CLAMP ? GL_CLAMP : wrapT == DGL_CLAMP_TO_EDGE ? GL_CLAMP_TO_EDGE : GL_REPEAT)); -#if defined (DENG_OPENGL_ES) +#if defined (DE_OPENGL_ES) # undef GL_CLAMP #endif } // dgl_draw.cpp -DENG_EXTERN_C void DGL_Begin(dglprimtype_t mode); -DENG_EXTERN_C void DGL_End(void); -DENG_EXTERN_C void DGL_Color3ub(DGLubyte r, DGLubyte g, DGLubyte b); -DENG_EXTERN_C void DGL_Color3ubv(const DGLubyte* vec); -DENG_EXTERN_C void DGL_Color4ub(DGLubyte r, DGLubyte g, DGLubyte b, DGLubyte a); -DENG_EXTERN_C void DGL_Color4ubv(const DGLubyte* vec); -DENG_EXTERN_C void DGL_Color3f(float r, float g, float b); -DENG_EXTERN_C void DGL_Color3fv(const float* vec); -DENG_EXTERN_C void DGL_Color4f(float r, float g, float b, float a); -DENG_EXTERN_C void DGL_Color4fv(const float* vec); -DENG_EXTERN_C void DGL_TexCoord2f(byte target, float s, float t); -DENG_EXTERN_C void DGL_TexCoord2fv(byte target, float const *vec); -DENG_EXTERN_C void DGL_Vertex2f(float x, float y); -DENG_EXTERN_C void DGL_Vertex2fv(const float* vec); -DENG_EXTERN_C void DGL_Vertex3f(float x, float y, float z); -DENG_EXTERN_C void DGL_Vertex3fv(const float* vec); -DENG_EXTERN_C void DGL_Vertices2ftv(int num, const dgl_ft2vertex_t* vec); -DENG_EXTERN_C void DGL_Vertices3ftv(int num, const dgl_ft3vertex_t* vec); -DENG_EXTERN_C void DGL_Vertices3fctv(int num, const dgl_fct3vertex_t* vec); -DENG_EXTERN_C void DGL_DrawLine(float x1, float y1, float x2, float y2, float r, float g, float b, float a); -DENG_EXTERN_C void DGL_DrawRect(const RectRaw* rect); -DENG_EXTERN_C void DGL_DrawRect2(int x, int y, int w, int h); -DENG_EXTERN_C void DGL_DrawRectf(const RectRawf* rect); -DENG_EXTERN_C void DGL_DrawRectf2(double x, double y, double w, double h); -DENG_EXTERN_C void DGL_DrawRectf2Color(double x, double y, double w, double h, float r, float g, float b, float a); -DENG_EXTERN_C void DGL_DrawRectf2Tiled(double x, double y, double w, double h, int tw, int th); -DENG_EXTERN_C void DGL_DrawCutRectfTiled(const RectRawf* rect, int tw, int th, int txoff, int tyoff, const RectRawf* cutRect); -DENG_EXTERN_C void DGL_DrawCutRectf2Tiled(double x, double y, double w, double h, int tw, int th, int txoff, int tyoff, double cx, double cy, double cw, double ch); -DENG_EXTERN_C void DGL_DrawQuadOutline(const Point2Raw* tl, const Point2Raw* tr, const Point2Raw* br, const Point2Raw* bl, const float color[4]); -DENG_EXTERN_C void DGL_DrawQuad2Outline(int tlX, int tlY, int trX, int trY, int brX, int brY, int blX, int blY, const float color[4]); +DE_EXTERN_C void DGL_Begin(dglprimtype_t mode); +DE_EXTERN_C void DGL_End(void); +DE_EXTERN_C void DGL_Color3ub(DGLubyte r, DGLubyte g, DGLubyte b); +DE_EXTERN_C void DGL_Color3ubv(const DGLubyte* vec); +DE_EXTERN_C void DGL_Color4ub(DGLubyte r, DGLubyte g, DGLubyte b, DGLubyte a); +DE_EXTERN_C void DGL_Color4ubv(const DGLubyte* vec); +DE_EXTERN_C void DGL_Color3f(float r, float g, float b); +DE_EXTERN_C void DGL_Color3fv(const float* vec); +DE_EXTERN_C void DGL_Color4f(float r, float g, float b, float a); +DE_EXTERN_C void DGL_Color4fv(const float* vec); +DE_EXTERN_C void DGL_TexCoord2f(byte target, float s, float t); +DE_EXTERN_C void DGL_TexCoord2fv(byte target, float const *vec); +DE_EXTERN_C void DGL_Vertex2f(float x, float y); +DE_EXTERN_C void DGL_Vertex2fv(const float* vec); +DE_EXTERN_C void DGL_Vertex3f(float x, float y, float z); +DE_EXTERN_C void DGL_Vertex3fv(const float* vec); +DE_EXTERN_C void DGL_Vertices2ftv(int num, const dgl_ft2vertex_t* vec); +DE_EXTERN_C void DGL_Vertices3ftv(int num, const dgl_ft3vertex_t* vec); +DE_EXTERN_C void DGL_Vertices3fctv(int num, const dgl_fct3vertex_t* vec); +DE_EXTERN_C void DGL_DrawLine(float x1, float y1, float x2, float y2, float r, float g, float b, float a); +DE_EXTERN_C void DGL_DrawRect(const RectRaw* rect); +DE_EXTERN_C void DGL_DrawRect2(int x, int y, int w, int h); +DE_EXTERN_C void DGL_DrawRectf(const RectRawf* rect); +DE_EXTERN_C void DGL_DrawRectf2(double x, double y, double w, double h); +DE_EXTERN_C void DGL_DrawRectf2Color(double x, double y, double w, double h, float r, float g, float b, float a); +DE_EXTERN_C void DGL_DrawRectf2Tiled(double x, double y, double w, double h, int tw, int th); +DE_EXTERN_C void DGL_DrawCutRectfTiled(const RectRawf* rect, int tw, int th, int txoff, int tyoff, const RectRawf* cutRect); +DE_EXTERN_C void DGL_DrawCutRectf2Tiled(double x, double y, double w, double h, int tw, int th, int txoff, int tyoff, double cx, double cy, double cw, double ch); +DE_EXTERN_C void DGL_DrawQuadOutline(const Point2Raw* tl, const Point2Raw* tr, const Point2Raw* br, const Point2Raw* bl, const float color[4]); +DE_EXTERN_C void DGL_DrawQuad2Outline(int tlX, int tlY, int trX, int trY, int brX, int brY, int blX, int blY, const float color[4]); // gl_draw.cpp -DENG_EXTERN_C void GL_UseFog(int yes); -DENG_EXTERN_C void GL_SetFilter(dd_bool enable); -DENG_EXTERN_C void GL_SetFilterColor(float r, float g, float b, float a); -DENG_EXTERN_C void GL_ConfigureBorderedProjection2(dgl_borderedprojectionstate_t* bp, int flags, int width, int height, int availWidth, int availHeight, scalemode_t overrideMode, float stretchEpsilon); -DENG_EXTERN_C void GL_ConfigureBorderedProjection(dgl_borderedprojectionstate_t* bp, int flags, int width, int height, int availWidth, int availHeight, scalemode_t overrideMode); -DENG_EXTERN_C void GL_BeginBorderedProjection(dgl_borderedprojectionstate_t* bp); -DENG_EXTERN_C void GL_EndBorderedProjection(dgl_borderedprojectionstate_t* bp); -DENG_EXTERN_C void GL_ResetViewEffects(); - -DENG_DECLARE_API(GL) = +DE_EXTERN_C void GL_UseFog(int yes); +DE_EXTERN_C void GL_SetFilter(dd_bool enable); +DE_EXTERN_C void GL_SetFilterColor(float r, float g, float b, float a); +DE_EXTERN_C void GL_ConfigureBorderedProjection2(dgl_borderedprojectionstate_t* bp, int flags, int width, int height, int availWidth, int availHeight, scalemode_t overrideMode, float stretchEpsilon); +DE_EXTERN_C void GL_ConfigureBorderedProjection(dgl_borderedprojectionstate_t* bp, int flags, int width, int height, int availWidth, int availHeight, scalemode_t overrideMode); +DE_EXTERN_C void GL_BeginBorderedProjection(dgl_borderedprojectionstate_t* bp); +DE_EXTERN_C void GL_EndBorderedProjection(dgl_borderedprojectionstate_t* bp); +DE_EXTERN_C void GL_ResetViewEffects(); + +DE_DECLARE_API(GL) = { { DE_API_GL }, DGL_Enable, diff --git a/doomsday/apps/client/src/gl/dgl_draw.cpp b/doomsday/apps/client/src/gl/dgl_draw.cpp index 4d1ea9bb40..356f106ad7 100644 --- a/doomsday/apps/client/src/gl/dgl_draw.cpp +++ b/doomsday/apps/client/src/gl/dgl_draw.cpp @@ -118,7 +118,7 @@ struct DGLDrawState void release() { -#if defined (DENG_HAVE_VAOS) +#if defined (DE_HAVE_VAOS) LIBGUI_GL.glDeleteVertexArrays(1, &vertexArray); #endif arrayData.clear(); @@ -312,7 +312,7 @@ struct DGLDrawState { glInit(); - DENG2_ASSERT(primType == DGL_NO_PRIMITIVE); + DE_ASSERT(primType == DGL_NO_PRIMITIVE); if (batchPrimType != DGL_NO_PRIMITIVE && !isCompatible(batchPrimType, primitive)) { @@ -444,7 +444,7 @@ struct DGLDrawState void glInit() { - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); if (!gl) { @@ -507,7 +507,7 @@ struct DGLDrawState auto *dbuf = new GLData::DrawBuffer; // Vertex array object. -#if defined (DENG_HAVE_VAOS) +#if defined (DE_HAVE_VAOS) { auto &GL = LIBGUI_GL; GL.glGenVertexArrays(1, &dbuf->vertexArray); @@ -534,7 +534,7 @@ struct DGLDrawState GLData::DrawBuffer &buf = nextBuffer(); buf.arrayData.setData(&vertices[0], sizeof(Vertex) * vertices.size(), gl::Dynamic); -#if defined (DENG_HAVE_VAOS) +#if defined (DE_HAVE_VAOS) GL.glBindVertexArray(buf.vertexArray); #else for (uint i = 0; i < NUM_VERTEX_ATTRIB_ARRAYS; ++i) @@ -563,7 +563,7 @@ struct DGLDrawState { auto &GL = LIBGUI_GL; -#if defined (DENG_HAVE_VAOS) +#if defined (DE_HAVE_VAOS) GL.glBindVertexArray(0); #else for (uint i = 0; i < NUM_VERTEX_ATTRIB_ARRAYS; ++i) @@ -721,9 +721,9 @@ void DGL_CurrentColor(float *rgba) } #undef DGL_Color3ub -DENG_EXTERN_C void DGL_Color3ub(DGLubyte r, DGLubyte g, DGLubyte b) +DE_EXTERN_C void DGL_Color3ub(DGLubyte r, DGLubyte g, DGLubyte b) { - DENG2_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_IN_RENDER_THREAD(); dglDraw.currentVertex.color[0] = r; dglDraw.currentVertex.color[1] = g; @@ -732,9 +732,9 @@ DENG_EXTERN_C void DGL_Color3ub(DGLubyte r, DGLubyte g, DGLubyte b) } #undef DGL_Color3ubv -DENG_EXTERN_C void DGL_Color3ubv(DGLubyte const *vec) +DE_EXTERN_C void DGL_Color3ubv(DGLubyte const *vec) { - DENG2_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_IN_RENDER_THREAD(); dglDraw.currentVertex.color[0] = vec[0]; dglDraw.currentVertex.color[1] = vec[1]; @@ -743,9 +743,9 @@ DENG_EXTERN_C void DGL_Color3ubv(DGLubyte const *vec) } #undef DGL_Color4ub -DENG_EXTERN_C void DGL_Color4ub(DGLubyte r, DGLubyte g, DGLubyte b, DGLubyte a) +DE_EXTERN_C void DGL_Color4ub(DGLubyte r, DGLubyte g, DGLubyte b, DGLubyte a) { - DENG2_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_IN_RENDER_THREAD(); dglDraw.currentVertex.color[0] = r; dglDraw.currentVertex.color[1] = g; @@ -754,9 +754,9 @@ DENG_EXTERN_C void DGL_Color4ub(DGLubyte r, DGLubyte g, DGLubyte b, DGLubyte a) } #undef DGL_Color4ubv -DENG_EXTERN_C void DGL_Color4ubv(DGLubyte const *vec) +DE_EXTERN_C void DGL_Color4ubv(DGLubyte const *vec) { - DENG2_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_IN_RENDER_THREAD(); dglDraw.currentVertex.color[0] = vec[0]; dglDraw.currentVertex.color[1] = vec[1]; @@ -765,9 +765,9 @@ DENG_EXTERN_C void DGL_Color4ubv(DGLubyte const *vec) } #undef DGL_Color3f -DENG_EXTERN_C void DGL_Color3f(float r, float g, float b) +DE_EXTERN_C void DGL_Color3f(float r, float g, float b) { - DENG2_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_IN_RENDER_THREAD(); const auto color = DGLDrawState::colorFromFloat({r, g, b, 1.f}); dglDraw.currentVertex.color[0] = color.x; @@ -777,9 +777,9 @@ DENG_EXTERN_C void DGL_Color3f(float r, float g, float b) } #undef DGL_Color3fv -DENG_EXTERN_C void DGL_Color3fv(float const *vec) +DE_EXTERN_C void DGL_Color3fv(float const *vec) { - DENG2_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_IN_RENDER_THREAD(); const auto color = DGLDrawState::colorFromFloat({Vec3f(vec), 1.f}); dglDraw.currentVertex.color[0] = color.x; @@ -789,9 +789,9 @@ DENG_EXTERN_C void DGL_Color3fv(float const *vec) } #undef DGL_Color4f -DENG_EXTERN_C void DGL_Color4f(float r, float g, float b, float a) +DE_EXTERN_C void DGL_Color4f(float r, float g, float b, float a) { - DENG2_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_IN_RENDER_THREAD(); const auto color = DGLDrawState::colorFromFloat({r, g, b, a}); dglDraw.currentVertex.color[0] = color.x; @@ -801,9 +801,9 @@ DENG_EXTERN_C void DGL_Color4f(float r, float g, float b, float a) } #undef DGL_Color4fv -DENG_EXTERN_C void DGL_Color4fv(float const *vec) +DE_EXTERN_C void DGL_Color4fv(float const *vec) { - DENG2_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_IN_RENDER_THREAD(); const auto color = DGLDrawState::colorFromFloat(vec); dglDraw.currentVertex.color[0] = color.x; @@ -813,10 +813,10 @@ DENG_EXTERN_C void DGL_Color4fv(float const *vec) } #undef DGL_TexCoord2f -DENG_EXTERN_C void DGL_TexCoord2f(byte target, float s, float t) +DE_EXTERN_C void DGL_TexCoord2f(byte target, float s, float t) { - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG2_ASSERT(target < MAX_TEX_COORDS); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT(target < MAX_TEX_COORDS); if (target < MAX_TEX_COORDS) { @@ -826,10 +826,10 @@ DENG_EXTERN_C void DGL_TexCoord2f(byte target, float s, float t) } #undef DGL_TexCoord2fv -DENG_EXTERN_C void DGL_TexCoord2fv(byte target, float const *vec) +DE_EXTERN_C void DGL_TexCoord2fv(byte target, float const *vec) { - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG2_ASSERT(target < MAX_TEX_COORDS); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT(target < MAX_TEX_COORDS); if (target < MAX_TEX_COORDS) { @@ -839,9 +839,9 @@ DENG_EXTERN_C void DGL_TexCoord2fv(byte target, float const *vec) } #undef DGL_Vertex2f -DENG_EXTERN_C void DGL_Vertex2f(float x, float y) +DE_EXTERN_C void DGL_Vertex2f(float x, float y) { - DENG2_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_IN_RENDER_THREAD(); dglDraw.currentVertex.vertex[0] = x; dglDraw.currentVertex.vertex[1] = y; @@ -850,9 +850,9 @@ DENG_EXTERN_C void DGL_Vertex2f(float x, float y) } #undef DGL_Vertex2fv -DENG_EXTERN_C void DGL_Vertex2fv(const float* vec) +DE_EXTERN_C void DGL_Vertex2fv(const float* vec) { - DENG2_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_IN_RENDER_THREAD(); if (vec) { @@ -864,9 +864,9 @@ DENG_EXTERN_C void DGL_Vertex2fv(const float* vec) } #undef DGL_Vertex3f -DENG_EXTERN_C void DGL_Vertex3f(float x, float y, float z) +DE_EXTERN_C void DGL_Vertex3f(float x, float y, float z) { - DENG2_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_IN_RENDER_THREAD(); dglDraw.currentVertex.vertex[0] = x; dglDraw.currentVertex.vertex[1] = y; @@ -876,9 +876,9 @@ DENG_EXTERN_C void DGL_Vertex3f(float x, float y, float z) } #undef DGL_Vertex3fv -DENG_EXTERN_C void DGL_Vertex3fv(const float* vec) +DE_EXTERN_C void DGL_Vertex3fv(const float* vec) { - DENG2_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_IN_RENDER_THREAD(); if (vec) { @@ -890,9 +890,9 @@ DENG_EXTERN_C void DGL_Vertex3fv(const float* vec) } #undef DGL_Vertices2ftv -DENG_EXTERN_C void DGL_Vertices2ftv(int num, const dgl_ft2vertex_t* vec) +DE_EXTERN_C void DGL_Vertices2ftv(int num, const dgl_ft2vertex_t* vec) { - DENG2_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_IN_RENDER_THREAD(); for(; num > 0; num--, vec++) { @@ -902,10 +902,10 @@ DENG_EXTERN_C void DGL_Vertices2ftv(int num, const dgl_ft2vertex_t* vec) } #undef DGL_Vertices3ftv -DENG_EXTERN_C void DGL_Vertices3ftv(int num, const dgl_ft3vertex_t* vec) +DE_EXTERN_C void DGL_Vertices3ftv(int num, const dgl_ft3vertex_t* vec) { - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); for(; num > 0; num--, vec++) { @@ -915,10 +915,10 @@ DENG_EXTERN_C void DGL_Vertices3ftv(int num, const dgl_ft3vertex_t* vec) } #undef DGL_Vertices3fctv -DENG_EXTERN_C void DGL_Vertices3fctv(int num, const dgl_fct3vertex_t* vec) +DE_EXTERN_C void DGL_Vertices3fctv(int num, const dgl_fct3vertex_t* vec) { - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); for(; num > 0; num--, vec++) { @@ -929,41 +929,41 @@ DENG_EXTERN_C void DGL_Vertices3fctv(int num, const dgl_fct3vertex_t* vec) } #undef DGL_Begin -DENG_EXTERN_C void DGL_Begin(dglprimtype_t mode) +DE_EXTERN_C void DGL_Begin(dglprimtype_t mode) { if (novideo) return; - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); dglDraw.beginPrimitive(mode); } void DGL_AssertNotInPrimitive(void) { - DENG_ASSERT(dglDraw.primType == DGL_NO_PRIMITIVE); + DE_ASSERT(dglDraw.primType == DGL_NO_PRIMITIVE); } #undef DGL_End -DENG_EXTERN_C void DGL_End(void) +DE_EXTERN_C void DGL_End(void) { if (novideo) return; - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); dglDraw.endPrimitive(); } #undef DGL_DrawLine -DENG_EXTERN_C void DGL_DrawLine(float x1, float y1, float x2, float y2, float r, +DE_EXTERN_C void DGL_DrawLine(float x1, float y1, float x2, float y2, float r, float g, float b, float a) { GL_DrawLine(x1, y1, x2, y2, r, g, b, a); } #undef DGL_DrawRect -DENG_EXTERN_C void DGL_DrawRect(RectRaw const *rect) +DE_EXTERN_C void DGL_DrawRect(RectRaw const *rect) { if (!rect) return; GL_DrawRect(Rectanglei::fromSize(Vec2i(rect->origin.xy), @@ -971,59 +971,59 @@ DENG_EXTERN_C void DGL_DrawRect(RectRaw const *rect) } #undef DGL_DrawRect2 -DENG_EXTERN_C void DGL_DrawRect2(int x, int y, int w, int h) +DE_EXTERN_C void DGL_DrawRect2(int x, int y, int w, int h) { GL_DrawRect2(x, y, w, h); } #undef DGL_DrawRectf -DENG_EXTERN_C void DGL_DrawRectf(RectRawf const *rect) +DE_EXTERN_C void DGL_DrawRectf(RectRawf const *rect) { GL_DrawRectf(rect); } #undef DGL_DrawRectf2 -DENG_EXTERN_C void DGL_DrawRectf2(double x, double y, double w, double h) +DE_EXTERN_C void DGL_DrawRectf2(double x, double y, double w, double h) { GL_DrawRectf2(x, y, w, h); } #undef DGL_DrawRectf2Color -DENG_EXTERN_C void DGL_DrawRectf2Color(double x, double y, double w, double h, float r, float g, float b, float a) +DE_EXTERN_C void DGL_DrawRectf2Color(double x, double y, double w, double h, float r, float g, float b, float a) { - DENG_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_IN_MAIN_THREAD(); DGL_Color4f(r, g, b, a); GL_DrawRectf2(x, y, w, h); } #undef DGL_DrawRectf2Tiled -DENG_EXTERN_C void DGL_DrawRectf2Tiled(double x, double y, double w, double h, int tw, int th) +DE_EXTERN_C void DGL_DrawRectf2Tiled(double x, double y, double w, double h, int tw, int th) { GL_DrawRectf2Tiled(x, y, w, h, tw, th); } #undef DGL_DrawCutRectfTiled -DENG_EXTERN_C void DGL_DrawCutRectfTiled(RectRawf const *rect, int tw, int th, int txoff, int tyoff, +DE_EXTERN_C void DGL_DrawCutRectfTiled(RectRawf const *rect, int tw, int th, int txoff, int tyoff, RectRawf const *cutRect) { GL_DrawCutRectfTiled(rect, tw, th, txoff, tyoff, cutRect); } #undef DGL_DrawCutRectf2Tiled -DENG_EXTERN_C void DGL_DrawCutRectf2Tiled(double x, double y, double w, double h, int tw, int th, +DE_EXTERN_C void DGL_DrawCutRectf2Tiled(double x, double y, double w, double h, int tw, int th, int txoff, int tyoff, double cx, double cy, double cw, double ch) { GL_DrawCutRectf2Tiled(x, y, w, h, tw, th, txoff, tyoff, cx, cy, cw, ch); } #undef DGL_DrawQuadOutline -DENG_EXTERN_C void DGL_DrawQuadOutline(Point2Raw const *tl, Point2Raw const *tr, +DE_EXTERN_C void DGL_DrawQuadOutline(Point2Raw const *tl, Point2Raw const *tr, Point2Raw const *br, Point2Raw const *bl, float const color[4]) { if(!tl || !tr || !br || !bl || (color && !(color[CA] > 0))) return; - DENG_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_IN_MAIN_THREAD(); if(color) DGL_Color4fv(color); DGL_Begin(DGL_LINE_STRIP); @@ -1036,7 +1036,7 @@ DENG_EXTERN_C void DGL_DrawQuadOutline(Point2Raw const *tl, Point2Raw const *tr, } #undef DGL_DrawQuad2Outline -DENG_EXTERN_C void DGL_DrawQuad2Outline(int tlX, int tlY, int trX, int trY, +DE_EXTERN_C void DGL_DrawQuad2Outline(int tlX, int tlY, int trX, int trY, int brX, int brY, int blX, int blY, const float color[4]) { Point2Raw tl, tr, bl, br; diff --git a/doomsday/apps/client/src/gl/gl_defer.cpp b/doomsday/apps/client/src/gl/gl_defer.cpp index 7abc7af1c7..51b8d99b60 100644 --- a/doomsday/apps/client/src/gl/gl_defer.cpp +++ b/doomsday/apps/client/src/gl/gl_defer.cpp @@ -18,7 +18,7 @@ * 02110-1301 USA */ -#define LIBDENG_DISABLE_DEFERRED_GL_API // using regular GL API calls +#define DE_DISABLE_DEFERRED_GL_API // using regular GL API calls #include "de_platform.h" #include "gl/gl_defer.h" @@ -157,9 +157,9 @@ static deferredtask_t* nextTask(void) } } -LIBDENG_GL_DEFER1(e, GLenum e) +DE_GL_DEFER1(e, GLenum e) { - DENG2_ASSERT(ptr != nullptr); + DE_ASSERT(ptr != nullptr); apifunc_t* api = (apifunc_t *) M_Malloc(sizeof(apifunc_t)); api->func.ptr_e = ptr; @@ -168,9 +168,9 @@ LIBDENG_GL_DEFER1(e, GLenum e) enqueueTask(DTT_FUNC_PTR_E, api); } -LIBDENG_GL_DEFER2(i, GLenum e, GLint i) +DE_GL_DEFER2(i, GLenum e, GLint i) { - DENG2_ASSERT(ptr != nullptr); + DE_ASSERT(ptr != nullptr); apifunc_t* api = (apifunc_t *) M_Malloc(sizeof(apifunc_t)); api->func.ptr_ei = ptr; @@ -179,9 +179,9 @@ LIBDENG_GL_DEFER2(i, GLenum e, GLint i) enqueueTask(DTT_FUNC_PTR_EI, api); } -LIBDENG_GL_DEFER2(f, GLenum e, GLfloat f) +DE_GL_DEFER2(f, GLenum e, GLfloat f) { - DENG2_ASSERT(ptr != nullptr); + DE_ASSERT(ptr != nullptr); apifunc_t* api = (apifunc_t *) M_Malloc(sizeof(apifunc_t)); api->func.ptr_ef = ptr; @@ -190,9 +190,9 @@ LIBDENG_GL_DEFER2(f, GLenum e, GLfloat f) enqueueTask(DTT_FUNC_PTR_EF, api); } -LIBDENG_GL_DEFER2(fv4, GLenum e, const GLfloat* floatArrayWithFourValues) +DE_GL_DEFER2(fv4, GLenum e, const GLfloat* floatArrayWithFourValues) { - DENG2_ASSERT(ptr != nullptr); + DE_ASSERT(ptr != nullptr); apifunc_t* api = (apifunc_t *) M_Malloc(sizeof(apifunc_t)); api->func.ptr_efv4 = ptr; @@ -201,9 +201,9 @@ LIBDENG_GL_DEFER2(fv4, GLenum e, const GLfloat* floatArrayWithFourValues) enqueueTask(DTT_FUNC_PTR_EFV4, api); } -LIBDENG_GL_DEFER2(uintArray, GLsizei s, const GLuint* v) +DE_GL_DEFER2(uintArray, GLsizei s, const GLuint* v) { - DENG2_ASSERT(ptr != nullptr); + DE_ASSERT(ptr != nullptr); apifunc_t* api = (apifunc_t *) M_Malloc(sizeof(apifunc_t)); api->func.ptr_uintArray = ptr; @@ -219,7 +219,7 @@ static void processTask(deferredtask_t *task) switch(task->type) { case DTT_UPLOAD_TEXTURECONTENT: - DENG2_ASSERT(task->data); + DE_ASSERT(task->data); GL_UploadTextureContent(*reinterpret_cast(task->data), gl::Immediate); break; @@ -339,8 +339,8 @@ void GL_ReserveNames(void) Sys_Lock(deferredMutex); if(reservedCount < NUM_RESERVED_TEXTURENAMES) { - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); LIBGUI_GL.glGenTextures(NUM_RESERVED_TEXTURENAMES - reservedCount, (GLuint*) &reservedTextureNames[reservedCount]); @@ -354,8 +354,8 @@ void GL_ReleaseReservedNames(void) if(!deferredInited) return; // Just ignore. - DENG_ASSERT_IN_MAIN_THREAD(); // not deferring here - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); // not deferring here + DE_ASSERT_GL_CONTEXT_ACTIVE(); Sys_Lock(deferredMutex); LIBGUI_GL.glDeleteTextures(reservedCount, (const GLuint*) reservedTextureNames); @@ -370,7 +370,7 @@ DGLuint GL_GetReservedTextureName(void) LOG_AS("GL_GetReservedTextureName"); - DENG_ASSERT(deferredInited); + DE_ASSERT(deferredInited); Sys_Lock(deferredMutex); @@ -429,8 +429,8 @@ void GL_ProcessDeferredTasks(uint timeOutMilliSeconds) if(novideo || !deferredInited) return; - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); startTime = Timer_RealMilliseconds(); @@ -452,7 +452,7 @@ void GL_ProcessDeferredTasks(uint timeOutMilliSeconds) gl::UploadMethod GL_ChooseUploadMethod(struct texturecontent_s const *content) { - DENG2_ASSERT(content != 0); + DE_ASSERT(content != 0); // Must the operation be carried out immediately? if((content->flags & TXCF_NEVER_DEFER) || !DoomsdayApp::busyMode().isActive()) diff --git a/doomsday/apps/client/src/gl/gl_deferredapi.cpp b/doomsday/apps/client/src/gl/gl_deferredapi.cpp index 06f8f583ff..7c4ad9446d 100644 --- a/doomsday/apps/client/src/gl/gl_deferredapi.cpp +++ b/doomsday/apps/client/src/gl/gl_deferredapi.cpp @@ -19,7 +19,7 @@ * 02110-1301 USA */ -#define LIBDENG_DISABLE_DEFERRED_GL_API // using regular GL API calls +#define DE_DISABLE_DEFERRED_GL_API // using regular GL API calls #include "de_platform.h" @@ -53,17 +53,17 @@ static void GL_CALL deng_glDeleteTextures(GLsizei num, GLuint const *names) #define GL_CALL2(form, func, x, y) \ if(mustDefer()) GL_Defer_##form(func, x, y); else func(x, y); -DENG_EXTERN_C void Deferred_glEnable(GLenum e) +DE_EXTERN_C void Deferred_glEnable(GLenum e) { GL_CALL1(e, deng_glEnable, e); } -DENG_EXTERN_C void Deferred_glDisable(GLenum e) +DE_EXTERN_C void Deferred_glDisable(GLenum e) { GL_CALL1(e, deng_glDisable, e); } -DENG_EXTERN_C void Deferred_glDeleteTextures(GLsizei num, GLuint const *names) +DE_EXTERN_C void Deferred_glDeleteTextures(GLsizei num, GLuint const *names) { GL_CALL2(uintArray, deng_glDeleteTextures, num, names); } diff --git a/doomsday/apps/client/src/gl/gl_draw.cpp b/doomsday/apps/client/src/gl/gl_draw.cpp index 32a3e0a18b..27e3820265 100644 --- a/doomsday/apps/client/src/gl/gl_draw.cpp +++ b/doomsday/apps/client/src/gl/gl_draw.cpp @@ -41,7 +41,7 @@ using namespace de; void GL_DrawRectWithCoords(Rectanglei const &rect, Vec2i const coords[4]) { - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); DGL_Begin(DGL_QUADS); // Top left. @@ -78,7 +78,7 @@ void GL_DrawRectfWithCoords(const RectRawf* rect, Point2Rawf coords[4]) { if(!rect) return; - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); DGL_Begin(DGL_QUADS); // Upper left. @@ -135,7 +135,7 @@ void GL_DrawRectf2TextureColor(double x, double y, double width, double height, { if(topAlpha <= 0 && bottomAlpha <= 0) return; - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); DGL_Begin(DGL_QUADS); // Top color. @@ -156,7 +156,7 @@ void GL_DrawRectf2TextureColor(double x, double y, double width, double height, void GL_DrawRectf2Tiled(double x, double y, double w, double h, int tw, int th) { - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); DGL_Begin(DGL_QUADS); DGL_TexCoord2f(0, 0, 0); @@ -184,7 +184,7 @@ void GL_DrawCutRectfTiled(const RectRawf* rect, int tw, int th, int txoff, int t float lefth = cutRect->origin.x - rect->origin.x; float righth = rect->origin.x + rect->size.width - (cutRect->origin.x + cutRect->size.width); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); DGL_Begin(DGL_QUADS); if(toph > 0) @@ -273,7 +273,7 @@ void GL_DrawCutRectf2Tiled(double x, double y, double w, double h, int tw, int t void GL_DrawLine(float x1, float y1, float x2, float y2, float r, float g, float b, float a) { - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); DGL_Color4f(r, g, b, a); DGL_Begin(DGL_LINES); @@ -283,7 +283,7 @@ void GL_DrawLine(float x1, float y1, float x2, float y2, float r, float g, } #undef GL_ResetViewEffects -DENG_EXTERN_C void GL_ResetViewEffects() +DE_EXTERN_C void GL_ResetViewEffects() { GL_SetFilter(false); Con_Executef(CMDS_DDAY, true, "postfx %i none", consolePlayer); @@ -291,7 +291,7 @@ DENG_EXTERN_C void GL_ResetViewEffects() } #undef GL_ConfigureBorderedProjection2 -DENG_EXTERN_C void GL_ConfigureBorderedProjection2(dgl_borderedprojectionstate_t* bp, int flags, +DE_EXTERN_C void GL_ConfigureBorderedProjection2(dgl_borderedprojectionstate_t* bp, int flags, int width, int height, int availWidth, int availHeight, scalemode_t overrideMode, float stretchEpsilon) { @@ -314,7 +314,7 @@ DENG_EXTERN_C void GL_ConfigureBorderedProjection2(dgl_borderedprojectionstate_t } #undef GL_ConfigureBorderedProjection -DENG_EXTERN_C void GL_ConfigureBorderedProjection(dgl_borderedprojectionstate_t* bp, int flags, +DE_EXTERN_C void GL_ConfigureBorderedProjection(dgl_borderedprojectionstate_t* bp, int flags, int width, int height, int availWidth, int availHeight, scalemode_t overrideMode) { GL_ConfigureBorderedProjection2(bp, flags, width, height, availWidth, @@ -322,15 +322,15 @@ DENG_EXTERN_C void GL_ConfigureBorderedProjection(dgl_borderedprojectionstate_t* } #undef GL_BeginBorderedProjection -DENG_EXTERN_C void GL_BeginBorderedProjection(dgl_borderedprojectionstate_t* bp) +DE_EXTERN_C void GL_BeginBorderedProjection(dgl_borderedprojectionstate_t* bp) { - DENG_ASSERT(bp != 0); + DE_ASSERT(bp != 0); if (!bp) return; if (bp->scaleMode == SCALEMODE_STRETCH) return; - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); /** * Use an orthographic projection in screenspace, translating and @@ -377,15 +377,15 @@ DENG_EXTERN_C void GL_BeginBorderedProjection(dgl_borderedprojectionstate_t* bp) } #undef GL_EndBorderedProjection -DENG_EXTERN_C void GL_EndBorderedProjection(dgl_borderedprojectionstate_t* bp) +DE_EXTERN_C void GL_EndBorderedProjection(dgl_borderedprojectionstate_t* bp) { - DENG_ASSERT(bp != 0); + DE_ASSERT(bp != 0); if(!bp) return; if (SCALEMODE_STRETCH == bp->scaleMode) return; - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); DGL_PopState(); diff --git a/doomsday/apps/client/src/gl/gl_drawvectorgraphic.cpp b/doomsday/apps/client/src/gl/gl_drawvectorgraphic.cpp index 0880d6a162..2391ca7aba 100644 --- a/doomsday/apps/client/src/gl/gl_drawvectorgraphic.cpp +++ b/doomsday/apps/client/src/gl/gl_drawvectorgraphic.cpp @@ -16,7 +16,7 @@ * http://www.gnu.org/licenses */ -#define DENG_NO_API_MACROS_SVG +#define DE_NO_API_MACROS_SVG #include "de_platform.h" #include "dd_share.h" @@ -147,12 +147,12 @@ void R_UnloadSvgs(void) } } -DENG_EXTERN_C void GL_DrawSvg3(svgid_t id, const Point2Rawf* origin, float scale, float angle) +DE_EXTERN_C void GL_DrawSvg3(svgid_t id, const Point2Rawf* origin, float scale, float angle) { Svg* svg = svgForId(id); - DENG_ASSERT(origin != 0); - DENG_ASSERT(svg != 0); + DE_ASSERT(origin != 0); + DE_ASSERT(svg != 0); if(!Svg_Prepare(svg)) { @@ -178,22 +178,22 @@ DENG_EXTERN_C void GL_DrawSvg3(svgid_t id, const Point2Rawf* origin, float scale DGL_Translatef(-origin->x, -origin->y, 0); } -DENG_EXTERN_C void GL_DrawSvg2(svgid_t id, const Point2Rawf* origin, float scale) +DE_EXTERN_C void GL_DrawSvg2(svgid_t id, const Point2Rawf* origin, float scale) { GL_DrawSvg3(id, origin, scale, DEFAULT_ANGLE); } -DENG_EXTERN_C void GL_DrawSvg(svgid_t id, const Point2Rawf* origin) +DE_EXTERN_C void GL_DrawSvg(svgid_t id, const Point2Rawf* origin) { GL_DrawSvg2(id, origin, DEFAULT_SCALE); } -DENG_EXTERN_C void R_NewSvg(svgid_t id, const def_svgline_t* lines, uint numLines) +DE_EXTERN_C void R_NewSvg(svgid_t id, const def_svgline_t* lines, uint numLines) { Svg* svg, *oldSvg; // Valid id? - DENG_ASSERT(id != 0); + DE_ASSERT(id != 0); // A new vector graphic. svg = Svg_FromDef(id, lines, numLines); @@ -215,7 +215,7 @@ DENG_EXTERN_C void R_NewSvg(svgid_t id, const def_svgline_t* lines, uint numLine insertSvg(svg); } -DENG_DECLARE_API(Svg) = +DE_DECLARE_API(Svg) = { { DE_API_SVG }, R_NewSvg, diff --git a/doomsday/apps/client/src/gl/gl_main.cpp b/doomsday/apps/client/src/gl/gl_main.cpp index f4710c7963..a5b201fa6a 100644 --- a/doomsday/apps/client/src/gl/gl_main.cpp +++ b/doomsday/apps/client/src/gl/gl_main.cpp @@ -134,7 +134,7 @@ void GL_SetGammaRamp(DisplayColorTransfer const *ramp) */ void GL_MakeGammaRamp(ushort *ramp, dfloat gamma, dfloat contrast, dfloat bright) { - DENG2_ASSERT(ramp); + DE_ASSERT(ramp); ddouble ideal[256]; // After processing clamped to unsigned short. @@ -199,7 +199,7 @@ void GL_FinishFrame() { if (ClientApp::vr().mode() == VRConfig::OculusRift) return; - DENG2_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_IN_RENDER_THREAD(); LIBGUI_ASSERT_GL_CONTEXT_ACTIVE(); // Check for color adjustment changes. @@ -208,7 +208,7 @@ void GL_FinishFrame() GL_SetGamma(); } -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) // Wait until the right time to show the frame so that the realized // frame rate is exactly right. LIBGUI_GL.glFlush(); @@ -307,8 +307,8 @@ void GL_Shutdown() if(!initGLOk || !ClientWindow::mainExists()) return; // Not yet initialized fully. - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); // We won't be drawing anything further but we don't want to shutdown // with the previous frame still visible as this can lead to unwanted @@ -345,7 +345,7 @@ void GL_Init2DState() glNearClip = 5; glFarClip = 16500; - DENG_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_IN_MAIN_THREAD(); //DGL_SetInteger(DGL_FLUSH_BACKTRACE, true); @@ -385,8 +385,8 @@ Rangef GL_DepthClipRange() void GL_ProjectionMatrix(bool useFixedFov) { - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); DGL_MatrixMode(DGL_PROJECTION); DGL_LoadMatrix(Rend_GetProjectionMatrix(useFixedFov ? weaponFixedFOV : 0.f).values()); @@ -429,15 +429,15 @@ void GL_SetupFogFromMapInfo(Record const *mapInfo) } #undef GL_UseFog -DENG_EXTERN_C void GL_UseFog(dint yes) +DE_EXTERN_C void GL_UseFog(dint yes) { fogParams.usingFog = yes; } void GL_SelectTexUnits(dint count) { - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); for (dint i = MAX_TEX_UNITS - 1; i >= count; i--) { @@ -489,15 +489,15 @@ void GL_TotalRestore() // Restore the fog settings. GL_SetupFogFromMapInfo(App_World().hasMap() ? &App_World().map().mapInfo() : nullptr); -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG Z_CheckHeap(); #endif } void GL_BlendMode(blendmode_t mode) { - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); switch(mode) { @@ -590,7 +590,7 @@ dint GL_NumMipmapLevels(dint width, dint height) dd_bool GL_OptimalTextureSize(dint width, dint height, dd_bool noStretch, dd_bool isMipMapped, dint *optWidth, dint *optHeight) { - DENG2_ASSERT(optWidth && optHeight); + DE_ASSERT(optWidth && optHeight); if (!isMipMapped) { *optWidth = width; @@ -796,7 +796,7 @@ void GL_SetRawImage(lumpnum_t lumpNum, gl::Wrapping wrapS, gl::Wrapping wrapT) void GL_BindTexture(TextureVariant *vtexture) { -#if defined (DENG_HAVE_BUSYRUNNER) +#if defined (DE_HAVE_BUSYRUNNER) if (ClientApp::busyRunner().inWorkerThread()) return; #endif @@ -808,8 +808,8 @@ void GL_BindTexture(TextureVariant *vtexture) return; } - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); LIBGUI_GL.glBindTexture(GL_TEXTURE_2D, glTexName); LIBGUI_ASSERT_GL_OK(); @@ -834,7 +834,7 @@ void GL_BindTexture(TextureVariant *vtexture) void GL_BindTextureUnmanaged(GLuint glName, gl::Wrapping wrapS, gl::Wrapping wrapT, gl::Filter filter) { -#if defined (DENG_HAVE_BUSYRUNNER) +#if defined (DE_HAVE_BUSYRUNNER) if (ClientApp::busyRunner().inWorkerThread()) return; #endif @@ -846,8 +846,8 @@ void GL_BindTextureUnmanaged(GLuint glName, gl::Wrapping wrapS, gl::Wrapping wra return; } - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); LIBGUI_GL.glBindTexture(GL_TEXTURE_2D, glName); LIBGUI_ASSERT_GL_OK(); @@ -887,20 +887,20 @@ void GL_BindTo(GLTextureUnit const &glTU, dint unit) { if(!glTU.hasTexture()) return; - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); DGL_SetInteger(DGL_ACTIVE_TEXTURE, unit); GL_Bind(glTU); } void GL_SetNoTexture() { -#if defined (DENG_HAVE_BUSYRUNNER) +#if defined (DE_HAVE_BUSYRUNNER) if(ClientApp::busyRunner().inWorkerThread()) return; #endif - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); /// @todo Don't actually change the current binding. Instead we should disable /// all currently enabled texture types. @@ -957,7 +957,7 @@ duint8 *GL_SmartFilter(dint method, duint8 const *src, dint width, dint height, duint8 *GL_ConvertBuffer(duint8 const *in, dint width, dint height, dint informat, colorpaletteid_t paletteId, dint outformat) { - DENG2_ASSERT(in); + DE_ASSERT(in); if(informat == outformat) { @@ -1012,7 +1012,7 @@ void GL_CalcLuminance(duint8 const *buffer, dint width, dint height, dint pixelS colorpaletteid_t paletteId, dfloat *retBrightX, dfloat *retBrightY, ColorRawf *retColor, dfloat *retLumSize) { - DENG2_ASSERT(buffer && retBrightX && retBrightY && retColor && retLumSize); + DE_ASSERT(buffer && retBrightX && retBrightY && retColor && retLumSize); static duint8 const sizeLimit = 192, brightLimit = 224, colLimit = 192; @@ -1205,11 +1205,11 @@ void GL_CalcLuminance(duint8 const *buffer, dint width, dint height, dint pixelS */ } -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) D_CMD(SetRes) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); ClientWindow *win = ClientWindowSystem::mainPtr(); if(!win) return false; @@ -1226,7 +1226,7 @@ D_CMD(SetRes) D_CMD(SetFullRes) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); ClientWindow *win = ClientWindowSystem::mainPtr(); if(!win) return false; @@ -1242,7 +1242,7 @@ D_CMD(SetFullRes) D_CMD(SetWinRes) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); ClientWindow *win = ClientWindowSystem::mainPtr(); if(!win) return false; @@ -1259,7 +1259,7 @@ D_CMD(SetWinRes) D_CMD(ToggleFullscreen) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); ClientWindow *win = ClientWindowSystem::mainPtr(); if(!win) return false; @@ -1273,7 +1273,7 @@ D_CMD(ToggleFullscreen) D_CMD(ToggleMaximized) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); ClientWindow *win = ClientWindowSystem::mainPtr(); if(!win) return false; @@ -1287,7 +1287,7 @@ D_CMD(ToggleMaximized) D_CMD(ToggleCentered) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); ClientWindow *win = ClientWindowSystem::mainPtr(); if(!win) return false; @@ -1301,7 +1301,7 @@ D_CMD(ToggleCentered) D_CMD(CenterWindow) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); ClientWindow *win = ClientWindowSystem::mainPtr(); if(!win) return false; @@ -1315,7 +1315,7 @@ D_CMD(CenterWindow) D_CMD(SetBPP) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); ClientWindow *win = ClientWindowSystem::mainPtr(); if(!win) return false; @@ -1327,11 +1327,11 @@ D_CMD(SetBPP) return win->changeAttributes(attribs); } -#endif // !DENG_MOBILE +#endif // !DE_MOBILE D_CMD(DisplayModeInfo) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); ClientWindow *win = ClientWindowSystem::mainPtr(); if(!win) return false; @@ -1356,11 +1356,11 @@ D_CMD(DisplayModeInfo) .arg(win->windowRect().size().asText()) .arg(win->fullscreenSize().asText()); -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) str += String("\n fullscreen:%1 centered:%2 maximized:%3") - .arg(DENG2_BOOL_YESNO( win->isFullScreen() )) - .arg(DENG2_BOOL_YESNO( win->isCentered() )) - .arg(DENG2_BOOL_YESNO( win->isMaximized() )); + .arg(DE_BOOL_YESNO( win->isFullScreen() )) + .arg(DE_BOOL_YESNO( win->isCentered() )) + .arg(DE_BOOL_YESNO( win->isMaximized() )); #endif LOG_GL_MSG("%s") << str; @@ -1369,7 +1369,7 @@ D_CMD(DisplayModeInfo) D_CMD(ListDisplayModes) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); LOG_GL_MSG("There are %i display modes available:") << DisplayMode_Count(); for(dint i = 0; i < DisplayMode_Count(); ++i) @@ -1393,7 +1393,7 @@ D_CMD(ListDisplayModes) D_CMD(UpdateGammaRamp) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); GL_SetGamma(); LOG_GL_VERBOSE("Gamma ramp set"); @@ -1402,7 +1402,7 @@ D_CMD(UpdateGammaRamp) D_CMD(Fog) { - DENG2_UNUSED(src); + DE_UNUSED(src); if(argc == 1) { @@ -1487,7 +1487,7 @@ D_CMD(Fog) void GL_Register() { // Cvars -#if defined (DENG_OPENGL) +#if defined (DE_OPENGL) C_VAR_INT ("rend-dev-wireframe", &renderWireframe, CVF_NO_ARCHIVE, 0, 2); #endif C_VAR_INT ("rend-fog-default", &fogModeDefault, 0, 0, 2); @@ -1514,7 +1514,7 @@ void GL_Register() C_CMD_FLAGS("fog", nullptr, Fog, CMDF_NO_NULLGAME|CMDF_NO_DEDICATED); C_CMD ("displaymode", "", DisplayModeInfo); C_CMD ("listdisplaymodes", "", ListDisplayModes); -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) C_CMD ("setcolordepth", "i", SetBPP); C_CMD ("setbpp", "i", SetBPP); C_CMD ("setres", "ii", SetRes); diff --git a/doomsday/apps/client/src/gl/gl_tex.cpp b/doomsday/apps/client/src/gl/gl_tex.cpp index 7f1bd7cf1e..8d8662ce8d 100644 --- a/doomsday/apps/client/src/gl/gl_tex.cpp +++ b/doomsday/apps/client/src/gl/gl_tex.cpp @@ -308,7 +308,7 @@ static void* packImage(int components, const float* tempOut, GLint typeOut, break; } default: - DENG2_ASSERT_FAIL("packImage: Unknown output type"); + DE_ASSERT_FAIL("packImage: Unknown output type"); return 0; } @@ -670,7 +670,7 @@ void GL_DownMipmap32(uint8_t* in, int width, int height, int comps) if(width == 1 && height == 1) { - DENG2_ASSERT_FAIL("GL_DownMipmap32: Can't be called for a 1x1 image."); + DE_ASSERT_FAIL("GL_DownMipmap32: Can't be called for a 1x1 image."); return; } @@ -708,7 +708,7 @@ void GL_DownMipmap8(uint8_t* in, uint8_t* fadedOut, int width, int height, float if(width == 1 && height == 1) { - DENG2_ASSERT_FAIL("GL_DownMipmap8: Can't be called for a 1x1 image."); + DE_ASSERT_FAIL("GL_DownMipmap8: Can't be called for a 1x1 image."); return; } @@ -738,7 +738,7 @@ void GL_DownMipmap8(uint8_t* in, uint8_t* fadedOut, int width, int height, float dd_bool GL_PalettizeImage(uint8_t *out, int outformat, res::ColorPalette const *palette, dd_bool applyTexGamma, uint8_t const *in, int informat, int width, int height) { - DENG2_ASSERT(in && out && palette); + DE_ASSERT(in && out && palette); if(width <= 0 || height <= 0) return false; @@ -783,7 +783,7 @@ dd_bool GL_PalettizeImage(uint8_t *out, int outformat, res::ColorPalette const * dd_bool GL_QuantizeImageToPalette(uint8_t *out, int outformat, res::ColorPalette const *palette, uint8_t const *in, int informat, int width, int height) { - DENG2_ASSERT(out != 0 && in != 0 && palette != 0); + DE_ASSERT(out != 0 && in != 0 && palette != 0); if(informat >= 3 && outformat <= 2 && width > 0 && height > 0) { @@ -813,7 +813,7 @@ dd_bool GL_QuantizeImageToPalette(uint8_t *out, int outformat, res::ColorPalette void GL_DeSaturatePalettedImage(uint8_t *pixels, res::ColorPalette const &palette, int width, int height) { - DENG2_ASSERT(pixels != 0); + DE_ASSERT(pixels != 0); if(!width || !height) return; @@ -856,7 +856,7 @@ void GL_DeSaturatePalettedImage(uint8_t *pixels, res::ColorPalette const &palett void FindAverageLineColorIdx(uint8_t const *data, int w, int h, int line, res::ColorPalette const &palette, dd_bool hasAlpha, ColorRawf *color) { - DENG2_ASSERT(data != 0 && color != 0); + DE_ASSERT(data != 0 && color != 0); long i, count, numpels, avg[3] = { 0, 0, 0 }; uint8_t const *start, *alphaStart; @@ -870,7 +870,7 @@ void FindAverageLineColorIdx(uint8_t const *data, int w, int h, int line, if(line >= h) { App_Log(DE2_DEV_GL_ERROR, "FindAverageLineColorIdx: height=%i, line=%i.", h, line); - DENG2_ASSERT_FAIL("FindAverageLineColorIdx: Attempted to average outside valid area."); + DE_ASSERT_FAIL("FindAverageLineColorIdx: Attempted to average outside valid area."); V3f_Set(color->rgb, 0, 0, 0); return; } @@ -916,7 +916,7 @@ void FindAverageLineColor(const uint8_t* pixels, int width, int height, if(line >= height) { App_Log(DE2_DEV_GL_ERROR, "EnhanceContrast: height=%i, line=%i.", height, line); - DENG2_ASSERT_FAIL("FindAverageLineColor: Attempted to average outside valid area."); + DE_ASSERT_FAIL("FindAverageLineColor: Attempted to average outside valid area."); V3f_Set(color->rgb, 0, 0, 0); return; @@ -951,7 +951,7 @@ void FindAverageColor(const uint8_t* pixels, int width, int height, if(pixelSize != 3 && pixelSize != 4) { App_Log(DE2_DEV_GL_ERROR, "FindAverageColor: pixelSize=%i", pixelSize); - DENG_ASSERT("FindAverageColor: Attempted on non-rgb(a) image."); + DE_ASSERT("FindAverageColor: Attempted on non-rgb(a) image."); V3f_Set(color->rgb, 0, 0, 0); return; @@ -974,7 +974,7 @@ void FindAverageColor(const uint8_t* pixels, int width, int height, void FindAverageColorIdx(uint8_t const *data, int w, int h, res::ColorPalette const &palette, dd_bool hasAlpha, ColorRawf *color) { - DENG2_ASSERT(data != 0 && color != 0); + DE_ASSERT(data != 0 && color != 0); long i, numpels, count, avg[3] = { 0, 0, 0 }; uint8_t const *alphaStart; @@ -1027,7 +1027,7 @@ void FindAverageAlpha(const uint8_t* pixels, int width, int height, if(pixelSize != 3 && pixelSize != 4) { App_Log(DE2_DEV_GL_ERROR, "FindAverageAlpha: pixelSize=%i", pixelSize); - DENG2_ASSERT_FAIL("FindAverageAlpha: Attempted on non-rgb(a) image."); + DE_ASSERT_FAIL("FindAverageAlpha: Attempted on non-rgb(a) image."); // Assume opaque. *alpha = 1; @@ -1102,7 +1102,7 @@ void FindClipRegionNonAlpha(const uint8_t* buffer, int width, int height, if(width <= 0 || height <= 0) { - DENG2_ASSERT_FAIL("FindClipRegionNonAlpha: Attempt to find region on zero-sized image."); + DE_ASSERT_FAIL("FindClipRegionNonAlpha: Attempt to find region on zero-sized image."); retRegion[0] = retRegion[1] = retRegion[2] = retRegion[3] = 0; return; @@ -1211,7 +1211,7 @@ void BlackOutlines(uint8_t* pixels, int width, int height) void ColorOutlinesIdx(uint8_t* buffer, int width, int height) { - DENG_ASSERT(buffer); + DE_ASSERT(buffer); const int numpels = width * height; uint8_t* w[5]; @@ -1413,7 +1413,7 @@ void EnhanceContrast(uint8_t* pixels, int width, int height, int comps) if(comps != 3 && comps != 4) { App_Log(DE2_DEV_GL_ERROR, "EnhanceContrast: comps=%i", comps); - DENG2_ASSERT_FAIL("EnhanceContrast: Attempted on non-rgb(a) image."); + DE_ASSERT_FAIL("EnhanceContrast: Attempted on non-rgb(a) image."); return; } @@ -1453,7 +1453,7 @@ void SharpenPixels(uint8_t* pixels, int width, int height, int comps) if(comps != 3 && comps != 4) { App_Log(DE2_DEV_GL_ERROR, "SharpenPixels: comps=%i", comps); - DENG2_ASSERT_FAIL("SharpenPixels: Attempted on non-rgb(a) image."); + DE_ASSERT_FAIL("SharpenPixels: Attempted on non-rgb(a) image."); return; } @@ -1491,7 +1491,7 @@ void SharpenPixels(uint8_t* pixels, int width, int height, int comps) */ static inline bool isKeyedColor(uint8_t *color) { - DENG2_ASSERT(color); + DE_ASSERT(color); return color[2] == 0xff && ((color[0] == 0xff && color[1] == 0) || (color[0] == 0 && color[1] == 0xff)); } @@ -1501,7 +1501,7 @@ static inline bool isKeyedColor(uint8_t *color) */ static void doColorKeying(uint8_t *rgbaBuf, int width) { - DENG2_ASSERT(rgbaBuf); + DE_ASSERT(rgbaBuf); for(int i = 0; i < width; ++i, rgbaBuf += 4) { @@ -1513,7 +1513,7 @@ static void doColorKeying(uint8_t *rgbaBuf, int width) uint8_t *ApplyColorKeying(uint8_t *buf, int width, int height, int pixelSize) { - DENG2_ASSERT(buf); + DE_ASSERT(buf); if(width <= 0 || height <= 0) return buf; diff --git a/doomsday/apps/client/src/gl/gl_texmanager.cpp b/doomsday/apps/client/src/gl/gl_texmanager.cpp index 4931094fb7..c48134b723 100644 --- a/doomsday/apps/client/src/gl/gl_texmanager.cpp +++ b/doomsday/apps/client/src/gl/gl_texmanager.cpp @@ -38,7 +38,7 @@ #include "sys_system.h" -#include "gl/gl_main.h" // DENG_ASSERT_GL_CONTEXT_ACTIVE +#include "gl/gl_main.h" // DE_ASSERT_GL_CONTEXT_ACTIVE #include "gl/texturecontent.h" //#include "render/r_main.h" @@ -198,7 +198,7 @@ GLuint GL_PrepareLSTexture(lightingtexid_t which) Image_ClearPixelData(image); } - DENG2_ASSERT(lightingTextures[which] != 0); + DE_ASSERT(lightingTextures[which] != 0); return lightingTextures[which]; } @@ -260,7 +260,7 @@ GLuint GL_PrepareSysFlaremap(flaretexid_t which) Image_ClearPixelData(image); } - DENG2_ASSERT(sysFlareTextures[which] != 0); + DE_ASSERT(sysFlareTextures[which] != 0); return sysFlareTextures[which]; } @@ -391,8 +391,8 @@ void GL_SetRawTexturesMinFilter(int newMinFilter) { if (raw->tex) // Is the texture loaded? { - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); LIBGUI_GL.glBindTexture(GL_TEXTURE_2D, raw->tex); LIBGUI_GL.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, newMinFilter); diff --git a/doomsday/apps/client/src/gl/svg.cpp b/doomsday/apps/client/src/gl/svg.cpp index 26efa1411b..736a761005 100644 --- a/doomsday/apps/client/src/gl/svg.cpp +++ b/doomsday/apps/client/src/gl/svg.cpp @@ -87,8 +87,8 @@ static void draw(const Svg* svg) { dglprimtype_t nextPrimType, primType = DGL_LINE_STRIP; - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); SvgLine const *lIt = svg->lines; for (uint i = 0; i < svg->lineCount; ++i, lIt++) @@ -303,7 +303,7 @@ Svg* Svg_FromDef(svgid_t uniqueId, const def_svgline_t* lines, uint lineCount) } // Link circularly? - DENG_ASSERT(prev); + DE_ASSERT(prev); prev->next = lineIsLoop? dlIt->head : NULL; dlIt->head->prev = lineIsLoop? prev : NULL; diff --git a/doomsday/apps/client/src/gl/sys_opengl.cpp b/doomsday/apps/client/src/gl/sys_opengl.cpp index 5c38894534..a42ec59fa0 100644 --- a/doomsday/apps/client/src/gl/sys_opengl.cpp +++ b/doomsday/apps/client/src/gl/sys_opengl.cpp @@ -32,7 +32,7 @@ #ifdef WIN32 # define GETPROC(Type, x) x = de::function_cast(wglGetProcAddress(#x)) -#elif defined (DENG_X11) +#elif defined (DE_X11) # include # undef None # define GETPROC(Type, x) x = de::function_cast(glXGetProcAddress((GLubyte const *)#x)) @@ -76,8 +76,8 @@ static void initialize(void) de::String Sys_GLDescription() { - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); de::String str; QTextStream os(&str); @@ -158,14 +158,14 @@ dd_bool Sys_GLInitialize(void) assert(doneEarlyInit); - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); assert(!Sys_GLCheckError()); if(firstTimeInit) { -#if defined (DENG_OPENGL) +#if defined (DE_OPENGL) const GLubyte* versionStr = LIBGUI_GL.glGetString(GL_VERSION); double version = (versionStr? strtod((const char*) versionStr, NULL) : 0); if(version == 0) @@ -237,8 +237,8 @@ void Sys_GLConfigureDefaultState(void) */ assert(doneEarlyInit); - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); LIBGUI_GL.glFrontFace(GL_CW); LIBGUI_ASSERT_GL_OK(); @@ -249,7 +249,7 @@ void Sys_GLConfigureDefaultState(void) DGL_Disable(DGL_TEXTURE_2D); -#if defined (DENG_OPENGL) +#if defined (DE_OPENGL) LIBGUI_GL.glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS); LIBGUI_ASSERT_GL_OK(); #endif @@ -268,7 +268,7 @@ void Sys_GLConfigureDefaultState(void) // de::GLInfo::setLineWidth(GL_state.currentLineWidth); -#if defined (DENG_OPENGL) +#if defined (DE_OPENGL) // Setup for antialiased lines/points. LIBGUI_GL.glEnable(GL_LINE_SMOOTH); LIBGUI_ASSERT_GL_OK(); @@ -374,7 +374,7 @@ void Sys_GLPrintExtensions(void) dd_bool Sys_GLCheckErrorArgs(char const *file, int line) { if (novideo) return false; -#ifdef DENG_DEBUG +#ifdef DE_DEBUG de::GLInfo::checkError(file, line); #endif return false; diff --git a/doomsday/apps/client/src/gl/texturecontent.cpp b/doomsday/apps/client/src/gl/texturecontent.cpp index 79407eef0e..7ab30920e4 100644 --- a/doomsday/apps/client/src/gl/texturecontent.cpp +++ b/doomsday/apps/client/src/gl/texturecontent.cpp @@ -94,7 +94,7 @@ static int BytesPerPixel(GLint format) void GL_InitTextureContent(texturecontent_t *content) { - DENG_ASSERT(content); + DE_ASSERT(content); content->format = dgltexformat_t(0); content->name = 0; content->pixels = 0; @@ -112,7 +112,7 @@ void GL_InitTextureContent(texturecontent_t *content) texturecontent_t *GL_ConstructTextureContentCopy(texturecontent_t const *other) { - DENG_ASSERT(other); + DE_ASSERT(other); texturecontent_t *c = (texturecontent_t*) M_Malloc(sizeof(*c)); @@ -129,7 +129,7 @@ texturecontent_t *GL_ConstructTextureContentCopy(texturecontent_t const *other) void GL_DestroyTextureContent(texturecontent_t *content) { - DENG_ASSERT(content); + DE_ASSERT(content); if (content->pixels) M_Free((uint8_t *)content->pixels); M_Free(content); } @@ -147,7 +147,7 @@ void GL_DestroyTextureContent(texturecontent_t *content) static dgltexformat_t prepareImageAsTexture(image_t &image, variantspecification_t const &spec) { - DENG_ASSERT(image.pixels); + DE_ASSERT(image.pixels); bool const monochrome = (spec.flags & TSF_MONOCHROME) != 0; bool const scaleSharp = (spec.flags & TSF_UPSCALE_AND_SHARPEN) != 0; @@ -298,7 +298,7 @@ static dgltexformat_t prepareImageAsTexture(image_t &image, static dgltexformat_t prepareImageAsDetailTexture(image_t &image, detailvariantspecification_t const &spec, float *baMul, float *hiMul, float *loMul) { - DENG_UNUSED(spec); + DE_UNUSED(spec); // We want a luminance map. if (image.pixelSize > 2) @@ -318,8 +318,8 @@ void GL_PrepareTextureContent(texturecontent_t &c, TextureVariantSpec const &spec, res::TextureManifest const &textureManifest) { - DENG_ASSERT(glTexName != 0); - DENG_ASSERT(image.pixels != 0); + DE_ASSERT(glTexName != 0); + DE_ASSERT(image.pixels != 0); // Initialize and assign a GL name to the content. GL_InitTextureContent(&c); @@ -403,7 +403,7 @@ void GL_PrepareTextureContent(texturecontent_t &c, default: // Invalid spec type. - DENG_ASSERT(false); + DE_ASSERT(false); } } @@ -416,7 +416,7 @@ void GL_PrepareTextureContent(texturecontent_t &c, */ static GLint ChooseTextureFormat(dgltexformat_t format, dd_bool allowCompression) { -#if defined (DENG_OPENGL_ES) +#if defined (DE_OPENGL_ES) switch (format) { @@ -429,7 +429,7 @@ static GLint ChooseTextureFormat(dgltexformat_t format, dd_bool allowCompression return GL_RGBA8; default: - DENG2_ASSERT_FAIL("ChooseTextureFormat: Invalid texture source format"); + DE_ASSERT_FAIL("ChooseTextureFormat: Invalid texture source format"); return 0; } @@ -466,7 +466,7 @@ static GLint ChooseTextureFormat(dgltexformat_t format, dd_bool allowCompression return !compress ? GL_LUMINANCE_ALPHA : GL_COMPRESSED_LUMINANCE_ALPHA;*/ default: - DENG2_ASSERT_FAIL("ChooseTextureFormat: Invalid texture source format"); + DE_ASSERT_FAIL("ChooseTextureFormat: Invalid texture source format"); return 0; // Unreachable. } @@ -502,7 +502,7 @@ static dd_bool uploadTexture(int glFormat, int loadFormat, const uint8_t* pixels const int packRowLength = 0, packAlignment = 1, packSkipRows = 0, packSkipPixels = 0; const int unpackRowLength = 0, unpackAlignment = 1, unpackSkipRows = 0, unpackSkipPixels = 0; int mipLevel = 0; - DENG_ASSERT(pixels); + DE_ASSERT(pixels); if (!(GL_LUMINANCE_ALPHA == loadFormat || GL_LUMINANCE == loadFormat || GL_RGB == loadFormat || GL_RGBA == loadFormat)) @@ -525,8 +525,8 @@ static dd_bool uploadTexture(int glFormat, int loadFormat, const uint8_t* pixels genMipmaps = 0; } - //DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + //DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); auto &GL = LIBGUI_GL; @@ -640,7 +640,7 @@ static dd_bool uploadTexture(int glFormat, int loadFormat, const uint8_t* pixels LIBGUI_ASSERT_GL_OK(); } - DENG_ASSERT(!Sys_GLCheckError()); + DE_ASSERT(!Sys_GLCheckError()); return true; } @@ -662,7 +662,7 @@ static dd_bool uploadTextureGrayMipmap(int glFormat, int loadFormat, const uint8 uint8_t* image, *faded, *out; const uint8_t* in; float invFactor; - DENG_ASSERT(pixels); + DE_ASSERT(pixels); if (!(GL_RGB == loadFormat || GL_LUMINANCE == loadFormat)) { @@ -721,7 +721,7 @@ static dd_bool uploadTextureGrayMipmap(int glFormat, int loadFormat, const uint8 M_Free(faded); M_Free(image); - DENG_ASSERT(!Sys_GLCheckError()); + DE_ASSERT(!Sys_GLCheckError()); return true; } @@ -947,8 +947,8 @@ void GL_UploadTextureContent(texturecontent_t const &content, gl::UploadMethod m } } - //DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + //DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); LIBGUI_GL.glBindTexture(GL_TEXTURE_2D, content.name); LIBGUI_GL.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, content.minFilter); @@ -958,7 +958,7 @@ void GL_UploadTextureContent(texturecontent_t const &content, gl::UploadMethod m if (GL_state.features.texFilterAniso) LIBGUI_GL.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, GL_GetTexAnisoMul(content.anisoFilter)); - DENG2_ASSERT(dglFormat == DGL_RGB || dglFormat == DGL_RGBA); + DE_ASSERT(dglFormat == DGL_RGB || dglFormat == DGL_RGBA); if (!(content.flags & TXCF_GRAY_MIPMAP)) { diff --git a/doomsday/apps/client/src/localplayer.cpp b/doomsday/apps/client/src/localplayer.cpp index 2ad62a819a..24e36fc96e 100644 --- a/doomsday/apps/client/src/localplayer.cpp +++ b/doomsday/apps/client/src/localplayer.cpp @@ -18,7 +18,7 @@ #include "localplayer.h" -DENG2_PIMPL_NOREF(LocalPlayer) +DE_PIMPL_NOREF(LocalPlayer) { }; diff --git a/doomsday/apps/client/src/macx/cursor_macx.mm b/doomsday/apps/client/src/macx/cursor_macx.mm index fe1567e99f..91b60cebf9 100644 --- a/doomsday/apps/client/src/macx/cursor_macx.mm +++ b/doomsday/apps/client/src/macx/cursor_macx.mm @@ -17,7 +17,7 @@ * http://www.gnu.org/licenses */ -#if !defined (DENG_IOS) +#if !defined (DE_IOS) #include diff --git a/doomsday/apps/client/src/main_client.cpp b/doomsday/apps/client/src/main_client.cpp index 077cb0bfa5..17c40ed7a5 100644 --- a/doomsday/apps/client/src/main_client.cpp +++ b/doomsday/apps/client/src/main_client.cpp @@ -50,7 +50,7 @@ #include #include -#if defined (DENG_STATIC_LINK) +#if defined (DE_STATIC_LINK) #include #include @@ -65,18 +65,18 @@ Q_IMPORT_PLUGIN(QtQuickLayoutsPlugin) Q_IMPORT_PLUGIN(QtQuickTemplates2Plugin) Q_IMPORT_PLUGIN(QtQuick2WindowPlugin) -DENG2_IMPORT_LIBRARY(importidtech1) -DENG2_IMPORT_LIBRARY(importudmf) -DENG2_IMPORT_LIBRARY(importdeh) -DENG2_IMPORT_LIBRARY(audio_fmod) -DENG2_IMPORT_LIBRARY(doom) -//DENG2_IMPORT_LIBRARY(heretic) -//DENG2_IMPORT_LIBRARY(hexen) -//DENG2_IMPORT_LIBRARY(doom64) +DE_IMPORT_LIBRARY(importidtech1) +DE_IMPORT_LIBRARY(importudmf) +DE_IMPORT_LIBRARY(importdeh) +DE_IMPORT_LIBRARY(audio_fmod) +DE_IMPORT_LIBRARY(doom) +//DE_IMPORT_LIBRARY(heretic) +//DE_IMPORT_LIBRARY(hexen) +//DE_IMPORT_LIBRARY(doom64) #endif -#if defined (DENG_MOBILE) +#if defined (DE_MOBILE) # include # include "ui/clientwindow.h" #endif @@ -108,7 +108,7 @@ int main(int argc, char **argv) { clientApp.initialize(); -#if defined (DENG_MOBILE) +#if defined (DE_MOBILE) // On mobile, Qt Quick is actually in charge of drawing the screen. // GLWindow is just an item that draws the UI background. qmlRegisterType>("Doomsday", 1, 0, "ClientWindow"); @@ -131,9 +131,9 @@ int main(int argc, char **argv) } // Check that all reference-counted objects have been deleted. - #if defined (DENG2_DEBUG) + #if defined (DE_DEBUG) { - #if defined (DENG_USE_COUNTED_TRACING) + #if defined (DE_USE_COUNTED_TRACING) { if(de::Counted::totalCount > 0) { @@ -142,7 +142,7 @@ int main(int argc, char **argv) } #else { - DENG2_ASSERT(de::Counted::totalCount == 0); + DE_ASSERT(de::Counted::totalCount == 0); } #endif } diff --git a/doomsday/apps/client/src/misc/color.cpp b/doomsday/apps/client/src/misc/color.cpp index 4d31a8eaef..bde4cfd946 100644 --- a/doomsday/apps/client/src/misc/color.cpp +++ b/doomsday/apps/client/src/misc/color.cpp @@ -22,12 +22,12 @@ float ColorRawf_AverageColor(ColorRawf* c) { - DENG_ASSERT(c); + DE_ASSERT(c); return (c->red + c->green + c->blue) / 3; } float ColorRawf_AverageColorMulAlpha(ColorRawf* c) { - DENG_ASSERT(c); + DE_ASSERT(c); return (c->red + c->green + c->blue) / 3 * c->alpha; } diff --git a/doomsday/apps/client/src/misc/face.cpp b/doomsday/apps/client/src/misc/face.cpp index 53c6226071..ce08babd8e 100644 --- a/doomsday/apps/client/src/misc/face.cpp +++ b/doomsday/apps/client/src/misc/face.cpp @@ -24,7 +24,7 @@ namespace de { -DENG2_PIMPL_NOREF(Face) +DE_PIMPL_NOREF(Face) { HEdge *hedge = nullptr; ///< First half-edge in the face geometry. AABoxd bounds; ///< Vertex bounding box. diff --git a/doomsday/apps/client/src/misc/hedge.cpp b/doomsday/apps/client/src/misc/hedge.cpp index ef8f774227..35c17faa44 100644 --- a/doomsday/apps/client/src/misc/hedge.cpp +++ b/doomsday/apps/client/src/misc/hedge.cpp @@ -28,7 +28,7 @@ namespace de { -DENG2_PIMPL_NOREF(HEdge) +DE_PIMPL_NOREF(HEdge) { HEdge *twin = nullptr; ///< Linked @em twin half-edge (that on the other side of "this" half-edge). HEdge *neighbors[2] { nullptr, nullptr }; ///< Previous (anticlockwise) and next half-edge (clockwise) around the @em face. diff --git a/doomsday/apps/client/src/misc/mesh.cpp b/doomsday/apps/client/src/misc/mesh.cpp index 05e7668272..234d680229 100644 --- a/doomsday/apps/client/src/misc/mesh.cpp +++ b/doomsday/apps/client/src/misc/mesh.cpp @@ -33,7 +33,7 @@ Mesh::Element::Element(Mesh &owner) Mesh &Mesh::Element::mesh() const { - DENG2_ASSERT(_owner != nullptr); + DE_ASSERT(_owner != nullptr); return *_owner; } @@ -59,7 +59,7 @@ void Mesh::Element::setMapElement(world::MapElement *newMapElement) _mapElement = newMapElement; } -DENG2_PIMPL_NOREF(Mesh) +DE_PIMPL_NOREF(Mesh) { Vertexs vertexs; ///< All vertexs in the mesh. HEdges hedges; ///< All half-edges in the mesh. diff --git a/doomsday/apps/client/src/misc/r_util.cpp b/doomsday/apps/client/src/misc/r_util.cpp index b797e8b4cf..b4450a5371 100644 --- a/doomsday/apps/client/src/misc/r_util.cpp +++ b/doomsday/apps/client/src/misc/r_util.cpp @@ -217,7 +217,7 @@ char const *R_NameForBlendMode(blendmode_t mode) } #undef R_ChooseAlignModeAndScaleFactor -DENG_EXTERN_C dd_bool R_ChooseAlignModeAndScaleFactor(float *scale, int width, int height, +DE_EXTERN_C dd_bool R_ChooseAlignModeAndScaleFactor(float *scale, int width, int height, int availWidth, int availHeight, scalemode_t scaleMode) { if(scaleMode == SCALEMODE_STRETCH) @@ -245,7 +245,7 @@ DENG_EXTERN_C dd_bool R_ChooseAlignModeAndScaleFactor(float *scale, int width, i } #undef R_ChooseScaleMode2 -DENG_EXTERN_C scalemode_t R_ChooseScaleMode2(int width, int height, int availWidth, int availHeight, +DE_EXTERN_C scalemode_t R_ChooseScaleMode2(int width, int height, int availWidth, int availHeight, scalemode_t overrideMode, float stretchEpsilon) { float const availRatio = float(availWidth) / availHeight; @@ -263,7 +263,7 @@ DENG_EXTERN_C scalemode_t R_ChooseScaleMode2(int width, int height, int availWid } #undef R_ChooseScaleMode -DENG_EXTERN_C scalemode_t R_ChooseScaleMode(int width, int height, int availWidth, int availHeight, +DE_EXTERN_C scalemode_t R_ChooseScaleMode(int width, int height, int availWidth, int availHeight, scalemode_t overrideMode) { return R_ChooseScaleMode2(availWidth, availHeight, width, height, overrideMode, diff --git a/doomsday/apps/client/src/network/base/masterserver.cpp b/doomsday/apps/client/src/network/base/masterserver.cpp index bbe9c624fa..4bc21dd163 100644 --- a/doomsday/apps/client/src/network/base/masterserver.cpp +++ b/doomsday/apps/client/src/network/base/masterserver.cpp @@ -59,7 +59,7 @@ static QString masterUrl(char const *suffix = 0) return std::move(u); } -DENG2_PIMPL_NOREF(MasterWorker) +DE_PIMPL_NOREF(MasterWorker) { QNetworkAccessManager *network; @@ -279,22 +279,22 @@ void N_MasterAnnounceServer(bool isOpen) info.setFlags(info.flags() & ~shell::ServerInfo::AllowJoin); } - DENG2_ASSERT(worker); + DE_ASSERT(worker); worker->newJob(MasterWorker::ANNOUNCE, info.asRecord()); #else - DENG_UNUSED(isOpen); + DE_UNUSED(isOpen); #endif } void N_MasterRequestList(void) { - DENG2_ASSERT(worker); + DE_ASSERT(worker); worker->newJob(MasterWorker::REQUEST_SERVERS); } int N_MasterGet(int index, shell::ServerInfo *info) { - DENG2_ASSERT(worker); + DE_ASSERT(worker); if (!worker->isAllDone()) { diff --git a/doomsday/apps/client/src/network/base/monitor.cpp b/doomsday/apps/client/src/network/base/monitor.cpp index b40d32ca65..51b2223937 100644 --- a/doomsday/apps/client/src/network/base/monitor.cpp +++ b/doomsday/apps/client/src/network/base/monitor.cpp @@ -83,7 +83,7 @@ static void Monitor_Print(void) D_CMD(NetFreqs) { - DENG2_UNUSED(src); + DE_UNUSED(src); if(argc == 1) // No args? { diff --git a/doomsday/apps/client/src/network/base/net_buf.cpp b/doomsday/apps/client/src/network/base/net_buf.cpp index 3a98e49949..08762f7789 100644 --- a/doomsday/apps/client/src/network/base/net_buf.cpp +++ b/doomsday/apps/client/src/network/base/net_buf.cpp @@ -104,7 +104,7 @@ static dd_bool N_LockQueue(dd_bool doAcquire) void N_PostMessage(netmessage_t *msg) { - DENG2_ASSERT(msg); + DE_ASSERT(msg); N_LockQueue(true); @@ -188,7 +188,7 @@ static netmessage_t *N_GetMessage() static void N_ReleaseMessage(netmessage_t *msg) { - DENG2_ASSERT(msg); + DE_ASSERT(msg); if(msg->handle) { delete [] reinterpret_cast(msg->handle); @@ -224,7 +224,7 @@ void N_SendPacket(dint flags) #ifdef __SERVER__ duint dest = 0; #else - DENG2_UNUSED(flags); + DE_UNUSED(flags); #endif // Is the network available? @@ -293,7 +293,7 @@ dint N_IdentifyPlayer(nodeid_t id) } return -1; #else - DENG2_UNUSED(id); + DE_UNUSED(id); #endif // Clients receive messages only from the server. diff --git a/doomsday/apps/client/src/network/base/net_event.cpp b/doomsday/apps/client/src/network/base/net_event.cpp index 24525a393f..0d9d8f2040 100644 --- a/doomsday/apps/client/src/network/base/net_event.cpp +++ b/doomsday/apps/client/src/network/base/net_event.cpp @@ -74,7 +74,7 @@ dd_bool N_MAGet(masteraction_t *act) if(::mqHead == ::mqTail) return false; - DENG2_ASSERT(act); + DE_ASSERT(act); *act = ::masterQueue[mqTail]; return true; } @@ -111,7 +111,7 @@ dd_bool N_MADone() */ void N_NEPost(netevent_t *nev) { - DENG2_ASSERT(nev); + DE_ASSERT(nev); ::netEventQueue[::neqHead] = *nev; ::neqHead = (::neqHead + 1) % NETEVENT_QUEUE_LEN; } @@ -139,7 +139,7 @@ dd_bool N_NEGet(netevent_t *nev) if(!N_NEPending()) return false; - DENG2_ASSERT(nev); + DE_ASSERT(nev); *nev = ::netEventQueue[::neqTail]; ::neqTail = (::neqTail + 1) % NETEVENT_QUEUE_LEN; return true; @@ -151,7 +151,7 @@ dd_bool N_NEGet(netevent_t *nev) void N_NETicker(timespan_t time) { #if !defined(__SERVER__) - DENG2_UNUSED(time); + DE_UNUSED(time); #endif #ifdef __SERVER__ @@ -203,7 +203,7 @@ void N_NETicker(timespan_t time) N_MARemove(); break; } - default: DENG2_ASSERT_FAIL("N_NETicker: Invalid value for 'act'"); break; + default: DE_ASSERT_FAIL("N_NETicker: Invalid value for 'act'"); break; } } } @@ -237,7 +237,7 @@ void N_Update() ::masterHeartbeat = MASTER_UPDATETIME; break; - default: DENG2_ASSERT_FAIL("N_Update: Invalid value"); break; + default: DE_ASSERT_FAIL("N_Update: Invalid value"); break; } } #endif // __SERVER__ @@ -250,7 +250,7 @@ void N_Update() void N_TerminateClient(dint console) { #ifdef __SERVER__ - DENG2_ASSERT(console >= 0 && console < DDMAXPLAYERS); + DE_ASSERT(console >= 0 && console < DDMAXPLAYERS); if(!DD_Player(console)->isConnected()) return; @@ -262,6 +262,6 @@ void N_TerminateClient(dint console) // Update the master. ::masterHeartbeat = MASTER_UPDATETIME; #else - DENG2_UNUSED(console); + DE_UNUSED(console); #endif } diff --git a/doomsday/apps/client/src/network/base/net_main.cpp b/doomsday/apps/client/src/network/base/net_main.cpp index d72d4ea94c..2adbab9883 100644 --- a/doomsday/apps/client/src/network/base/net_main.cpp +++ b/doomsday/apps/client/src/network/base/net_main.cpp @@ -69,7 +69,7 @@ # include "ui/ui_main.h" # include "ui/inputdebug.h" # include "ui/widgets/taskbarwidget.h" -# ifdef DENG2_DEBUG +# ifdef DE_DEBUG # include "ui/zonedebug.h" # endif #endif @@ -133,20 +133,20 @@ void Net_Shutdown() } #undef Net_GetPlayerName -DENG_EXTERN_C char const *Net_GetPlayerName(dint player) +DE_EXTERN_C char const *Net_GetPlayerName(dint player) { return DD_Player(player)->name; } #undef Net_GetPlayerID -DENG_EXTERN_C ident_t Net_GetPlayerID(dint player) +DE_EXTERN_C ident_t Net_GetPlayerID(dint player) { #ifdef __SERVER__ auto &cl = *DD_Player(player); if(cl.isConnected()) return cl.id; #else - DENG_UNUSED(player); + DE_UNUSED(player); #endif return 0; } @@ -216,7 +216,7 @@ dd_bool Net_GetPacket() #ifdef __CLIENT__ // Are we recording a demo? - DENG2_ASSERT(consolePlayer >= 0 && consolePlayer < DDMAXPLAYERS); + DE_ASSERT(consolePlayer >= 0 && consolePlayer < DDMAXPLAYERS); if(::isClient && DD_Player(::consolePlayer)->recording) { Demo_WritePacket(::consolePlayer); @@ -227,7 +227,7 @@ dd_bool Net_GetPacket() } #undef Net_PlayerSmoother -DENG_EXTERN_C Smoother* Net_PlayerSmoother(dint player) +DE_EXTERN_C Smoother* Net_PlayerSmoother(dint player) { if(player < 0 || player >= DDMAXPLAYERS) return 0; @@ -237,7 +237,7 @@ DENG_EXTERN_C Smoother* Net_PlayerSmoother(dint player) void Net_SendPlayerInfo(dint srcPlrNum, dint destPlrNum) { - DENG2_ASSERT(srcPlrNum >= 0 && srcPlrNum < DDMAXPLAYERS); + DE_ASSERT(srcPlrNum >= 0 && srcPlrNum < DDMAXPLAYERS); dsize const nameLen = strlen(DD_Player(srcPlrNum)->name); LOG_AS("Net_SendPlayerInfo"); @@ -256,16 +256,16 @@ void Net_SendPlayerInfo(dint srcPlrNum, dint destPlrNum) * This is the public interface of the message sender. */ #undef Net_SendPacket -DENG_EXTERN_C void Net_SendPacket(dint to_player, dint type, void const *data, dsize length) +DE_EXTERN_C void Net_SendPacket(dint to_player, dint type, void const *data, dsize length) { duint flags = 0; -#ifndef DENG_WRITER_TYPECHECK +#ifndef DE_WRITER_TYPECHECK Msg_Begin(type); if(data) Writer_Write(::msgWriter, data, length); Msg_End(); #else - DENG2_ASSERT(length <= NETBUFFER_MAXSIZE); + DE_ASSERT(length <= NETBUFFER_MAXSIZE); ::netBuffer.msg.type = type; ::netBuffer.length = length; if(data) std::memcpy(::netBuffer.msg.data, data, length); @@ -290,7 +290,7 @@ DENG_EXTERN_C void Net_SendPacket(dint to_player, dint type, void const *data, d */ void Net_ShowChatMessage(dint plrNum, char const *message) { - DENG2_ASSERT(plrNum >= 0 && plrNum < DDMAXPLAYERS); + DE_ASSERT(plrNum >= 0 && plrNum < DDMAXPLAYERS); char const *fromName = (plrNum > 0 ? DD_Player(plrNum)->name : "[sysop]"); char const *sep = (plrNum > 0 ? ":" : ""); LOG_NOTE("%s%s%s %s") @@ -317,7 +317,7 @@ void Net_ResetTimer() */ dd_bool Net_IsLocalPlayer(dint plrNum) { - DENG2_ASSERT(plrNum >= 0 && plrNum < DDMAXPLAYERS); + DE_ASSERT(plrNum >= 0 && plrNum < DDMAXPLAYERS); auto const &pd = DD_Player(plrNum)->publicData(); return pd.inGame && (pd.flags & DDPF_LOCAL); } @@ -355,7 +355,7 @@ static void Net_DoUpdate() // Clients will periodically send their coordinates to the server so any prediction // errors can be fixed. Client movement is almost entirely local. - DENG2_ASSERT(::consolePlayer >= 0 && ::consolePlayer < DDMAXPLAYERS); + DE_ASSERT(::consolePlayer >= 0 && ::consolePlayer < DDMAXPLAYERS); ::coordTimer -= newTics; if(::isClient && ::coordTimer <= 0 && DD_Player(::consolePlayer)->publicData().mo) @@ -492,7 +492,7 @@ void Net_StopGame() if(DD_Player(0)->publicData().mo) { /* $unifiedangles */ - DENG2_ASSERT(::consolePlayer >= 0 && ::consolePlayer < DDMAXPLAYERS); + DE_ASSERT(::consolePlayer >= 0 && ::consolePlayer < DDMAXPLAYERS); DD_Player(0)->publicData().mo->angle = DD_Player(::consolePlayer)->publicData().mo->angle; DD_Player(0)->publicData().lookDir = DD_Player(::consolePlayer)->publicData().lookDir; } @@ -551,7 +551,7 @@ static dd_bool recordingDemo() void Net_DrawDemoOverlay() { - dint const x = DENG_GAMEVIEW_WIDTH - 10; + dint const x = DE_GAMEVIEW_WIDTH - 10; dint const y = 10; if(!recordingDemo() || !(SECONDS_TO_TICKS(::gameTime) & 8)) @@ -577,14 +577,14 @@ void Net_DrawDemoOverlay() } strcat(buf, "]"); - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); // Go into screen projection mode. DGL_MatrixMode(DGL_PROJECTION); DGL_PushMatrix(); DGL_LoadIdentity(); - DGL_Ortho(0, 0, DENG_GAMEVIEW_WIDTH, DENG_GAMEVIEW_HEIGHT, -1, 1); + DGL_Ortho(0, 0, DE_GAMEVIEW_WIDTH, DE_GAMEVIEW_HEIGHT, -1, 1); DGL_Enable(DGL_TEXTURE_2D); @@ -611,7 +611,7 @@ void Net_Drawer() // Draw the light range debug display. Rend_DrawLightModMatrix(); -# ifdef DENG2_DEBUG +# ifdef DE_DEBUG // Draw the input debug display. I_DebugDrawer(); # endif @@ -619,7 +619,7 @@ void Net_Drawer() // Draw the demo recording overlay. Net_DrawDemoOverlay(); -# if defined (DENG2_DEBUG) && defined (DENG_OPENGL) +# if defined (DE_DEBUG) && defined (DE_OPENGL) Z_DebugDrawer(); # endif #endif // __CLIENT__ @@ -692,7 +692,7 @@ static dd_bool tokenize(char const *line, char *label, char *value, int valueSiz if(!colon || colon - src >= SVINFO_VALID_LABEL_LEN || valueSize <= 0) return false; - DENG2_ASSERT(label && value); + DE_ASSERT(label && value); // Copy the label. qstrncpy(label, src, de::min(int(colon - src + 1), valueSize)); @@ -707,7 +707,7 @@ static dd_bool tokenize(char const *line, char *label, char *value, int valueSiz void ServerInfo_FromRecord(serverinfo_t *info, de::Record const &rec) { - DENG2_ASSERT(info); + DE_ASSERT(info); de::zapPtr(info); info->port = (dint) rec["port"].value().asNumber(); @@ -747,7 +747,7 @@ dd_bool ServerInfo_FromString(serverinfo_t *info, char const *valuePair) return false; } - DENG2_ASSERT(info); + DE_ASSERT(info); if(!strcmp(label, "at")) { @@ -859,7 +859,7 @@ void Net_WriteChatMessage(dint from, dint toMask, char const *message) */ D_CMD(Chat) { - DENG2_UNUSED(src); + DE_UNUSED(src); dint mode = !stricmp(argv[0], "chat") || !stricmp(argv[0], "say") ? 0 : !stricmp(argv[0], "chatNum") || @@ -953,7 +953,7 @@ D_CMD(Chat) #ifdef __SERVER__ D_CMD(Kick) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); LOG_AS("kick (Cmd)") @@ -990,7 +990,7 @@ D_CMD(Kick) #ifdef __CLIENT__ D_CMD(SetName) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); Con_SetString("net-name", argv[1]); @@ -1010,7 +1010,7 @@ D_CMD(SetName) D_CMD(SetTicks) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); // extern double lastSharpFrameTime; @@ -1023,7 +1023,7 @@ D_CMD(SetTicks) // Create a new local player. D_CMD(MakeCamera) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); LOG_AS("makecam (Cmd)"); @@ -1063,7 +1063,7 @@ D_CMD(MakeCamera) D_CMD(SetConsole) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); dint cp = String(argv[1]).toInt(); if(cp < 0 || cp >= DDMAXPLAYERS) @@ -1097,7 +1097,7 @@ dint Net_StartConnection(char const *address, dint port) */ D_CMD(Connect) { - DENG2_UNUSED(src); + DE_UNUSED(src); if(argc < 2 || argc > 3) { @@ -1136,7 +1136,7 @@ D_CMD(Connect) */ D_CMD(Net) { - DENG2_UNUSED(src); + DE_UNUSED(src); bool success = true; @@ -1305,7 +1305,7 @@ void Net_Register() { C_VAR_BYTE ("net-queue-show", &::monitorMsgQueue, 0, 0, 1); C_VAR_BYTE ("net-dev", &::netDev, 0, 0, 1); -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG C_VAR_FLOAT ("net-dev-latency", &::netSimulatedLatencySeconds, CVF_NO_MAX, 0, 0); #endif //C_VAR_BYTE ("net-nosleep", &::netDontSleep, 0, 0, 1); diff --git a/doomsday/apps/client/src/network/base/net_msg.cpp b/doomsday/apps/client/src/network/base/net_msg.cpp index 95241fb89a..c2ef89a946 100644 --- a/doomsday/apps/client/src/network/base/net_msg.cpp +++ b/doomsday/apps/client/src/network/base/net_msg.cpp @@ -1,6 +1,6 @@ /** @file net_msg.cpp Network Messaging. * - * Buffer overflow checks *ARE NOT* made ifndef DENG2_DEBUG. + * Buffer overflow checks *ARE NOT* made ifndef DE_DEBUG. * Buffer data is written using little-endian ordering. * * Note that negative values are not good for the packed write/read routines, @@ -65,7 +65,7 @@ dd_bool Msg_BeingWritten() void Msg_End() { - DENG2_ASSERT(::msgWriter); + DE_ASSERT(::msgWriter); // Finalize the netbuffer. // Message type is included as the first byte. @@ -90,7 +90,7 @@ void Msg_BeginRead() } // Start reading from the netbuffer. - DENG2_ASSERT(::msgReader == nullptr); + DE_ASSERT(::msgReader == nullptr); ::msgReader = Reader_NewWithNetworkBuffer(); } diff --git a/doomsday/apps/client/src/network/base/net_ping.cpp b/doomsday/apps/client/src/network/base/net_ping.cpp index a490fff9ec..6d562f5455 100644 --- a/doomsday/apps/client/src/network/base/net_ping.cpp +++ b/doomsday/apps/client/src/network/base/net_ping.cpp @@ -30,7 +30,7 @@ using namespace de; void Net_ShowPingSummary(dint player) { - DENG2_ASSERT(player >= 0 && player < DDMAXPLAYERS); + DE_ASSERT(player >= 0 && player < DDMAXPLAYERS); auto const &cl = *DD_Player(player); Pinger const &ping = cl.pinger(); @@ -55,7 +55,7 @@ void Net_ShowPingSummary(dint player) void Net_SendPing(dint player, dint count) { - DENG2_ASSERT(player >= 0 && player < DDMAXPLAYERS); + DE_ASSERT(player >= 0 && player < DDMAXPLAYERS); Pinger &ping = DD_Player(player)->pinger(); // Valid destination? @@ -99,7 +99,7 @@ void Net_SendPing(dint player, dint count) void Net_PingResponse() { dint const player = ::netBuffer.player; - DENG2_ASSERT(player >= 0 && player < DDMAXPLAYERS); + DE_ASSERT(player >= 0 && player < DDMAXPLAYERS); Pinger &ping = DD_Player(player)->pinger(); // Is this a response to our ping? @@ -120,7 +120,7 @@ void Net_PingResponse() D_CMD(Ping) { - DENG2_UNUSED(src); + DE_UNUSED(src); if(!::netGame) { diff --git a/doomsday/apps/client/src/network/net_demo.cpp b/doomsday/apps/client/src/network/net_demo.cpp index 7a99439182..8d93199424 100644 --- a/doomsday/apps/client/src/network/net_demo.cpp +++ b/doomsday/apps/client/src/network/net_demo.cpp @@ -144,7 +144,7 @@ dd_bool Demo_BeginRecording(char const * /*fileName*/, dint /*plrNum*/) void Demo_PauseRecording(dint playerNum) { - DENG2_ASSERT(playerNum >= 0 && playerNum < DDMAXPLAYERS); + DE_ASSERT(playerNum >= 0 && playerNum < DDMAXPLAYERS); auto &cl = *DD_Player(playerNum); // A demo is not being recorded? @@ -161,7 +161,7 @@ void Demo_PauseRecording(dint playerNum) */ void Demo_ResumeRecording(dint playerNum) { - DENG2_ASSERT(playerNum >= 0 && playerNum < DDMAXPLAYERS); + DE_ASSERT(playerNum >= 0 && playerNum < DDMAXPLAYERS); auto &cl = *DD_Player(playerNum); // Not recording or not paused? @@ -181,7 +181,7 @@ void Demo_ResumeRecording(dint playerNum) */ void Demo_StopRecording(dint playerNum) { - DENG2_ASSERT(playerNum >= 0 && playerNum < DDMAXPLAYERS); + DE_ASSERT(playerNum >= 0 && playerNum < DDMAXPLAYERS); auto &cl = *DD_Player(playerNum); // A demo is not being recorded? @@ -194,7 +194,7 @@ void Demo_StopRecording(dint playerNum) void Demo_WritePacket(dint playerNum) { - DENG_UNUSED(playerNum); + DE_UNUSED(playerNum); #if 0 if(playerNum < 0) { @@ -202,7 +202,7 @@ void Demo_WritePacket(dint playerNum) return; } - DENG2_ASSERT(playerNum >= 0 && playerNum < DDMAXPLAYERS); + DE_ASSERT(playerNum >= 0 && playerNum < DDMAXPLAYERS); auto &cl = *DD_Player(playerNum); DemoTimer &inf = cl.demoTimer(); @@ -408,7 +408,7 @@ dd_bool Demo_ReadPacket() */ void Demo_WriteLocalCamera(dint plrNum) { - DENG2_ASSERT(plrNum >= 0 && plrNum <= DDMAXPLAYERS); + DE_ASSERT(plrNum >= 0 && plrNum <= DDMAXPLAYERS); player_t *plr = DD_Player(plrNum); ddplayer_t *ddpl = &plr->publicData(); mobj_t *mob = ddpl->mo; @@ -457,7 +457,7 @@ void Demo_WriteLocalCamera(dint plrNum) */ void Demo_ReadLocalCamera() { - DENG2_ASSERT(::consolePlayer >= 0 && consolePlayer < DDMAXPLAYERS); + DE_ASSERT(::consolePlayer >= 0 && consolePlayer < DDMAXPLAYERS); ddplayer_t *pl = &DD_Player(::consolePlayer)->publicData(); mobj_t *mob = pl->mo; @@ -548,7 +548,7 @@ void Demo_Ticker(timespan_t /*time*/) // Only playback is handled. if(::playback) { - DENG2_ASSERT(::consolePlayer >= 0 && ::consolePlayer < DDMAXPLAYERS); + DE_ASSERT(::consolePlayer >= 0 && ::consolePlayer < DDMAXPLAYERS); player_t *plr = DD_Player(::consolePlayer); ddplayer_t *ddpl = &plr->publicData(); @@ -580,7 +580,7 @@ void Demo_Ticker(timespan_t /*time*/) D_CMD(PlayDemo) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); LOG_MSG("Playing demo \"%s\"...") << argv[1]; return Demo_BeginPlayback(argv[1]); @@ -588,7 +588,7 @@ D_CMD(PlayDemo) D_CMD(RecordDemo) { - DENG2_UNUSED(src); + DE_UNUSED(src); if(argc == 3 && ::isClient) { @@ -621,7 +621,7 @@ D_CMD(RecordDemo) D_CMD(PauseDemo) { - DENG2_UNUSED(src); + DE_UNUSED(src); dint plnum = ::consolePlayer; if(argc >= 2) @@ -654,7 +654,7 @@ D_CMD(PauseDemo) D_CMD(StopDemo) { - DENG2_UNUSED(src); + DE_UNUSED(src); if(argc > 2) { @@ -703,7 +703,7 @@ D_CMD(StopDemo) */ D_CMD(DemoLump) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); char buf[64]; de::zap(buf); strncpy(buf, argv[1], 64); diff --git a/doomsday/apps/client/src/network/serverlink.cpp b/doomsday/apps/client/src/network/serverlink.cpp index f97b26c0ff..aa5cd60cc1 100644 --- a/doomsday/apps/client/src/network/serverlink.cpp +++ b/doomsday/apps/client/src/network/serverlink.cpp @@ -68,7 +68,7 @@ enum LinkState static int const NUM_PINGS = 5; -DENG2_PIMPL(ServerLink) +DE_PIMPL(ServerLink) { std::unique_ptr finder; ///< Finding local servers. LinkState state; @@ -98,13 +98,13 @@ DENG2_PIMPL(ServerLink) void notifyDiscoveryUpdate() { - DENG2_FOR_PUBLIC_AUDIENCE2(DiscoveryUpdate, i) i->linkDiscoveryUpdate(self()); + DE_FOR_PUBLIC_AUDIENCE2(DiscoveryUpdate, i) i->linkDiscoveryUpdate(self()); emit self().serversDiscovered(); } bool handleInfoResponse(Block const &reply) { - DENG2_ASSERT(state == WaitingForInfoResponse); + DE_ASSERT(state == WaitingForInfoResponse); // Address of the server where the info was received. Address svAddress = self().address(); @@ -183,7 +183,7 @@ DENG2_PIMPL(ServerLink) Reader src(data); src.withHeader() >> outline; } - DENG2_FOR_PUBLIC_AUDIENCE2(MapOutline, i) + DE_FOR_PUBLIC_AUDIENCE2(MapOutline, i) { i->mapOutlineReceived(svAddress, outline); } @@ -228,7 +228,7 @@ DENG2_PIMPL(ServerLink) // Call game's NetConnect. gx.NetConnect(false); - DENG2_FOR_PUBLIC_AUDIENCE2(Join, i) i->networkGameJoined(); + DE_FOR_PUBLIC_AUDIENCE2(Join, i) i->networkGameJoined(); // G'day mate! The client is responsible for beginning the handshake. Cl_SendHello(); @@ -248,7 +248,7 @@ DENG2_PIMPL(ServerLink) void checkMasterReply() { - DENG2_ASSERT(fetching); + DE_ASSERT(fetching); if (N_MADone()) { @@ -337,18 +337,18 @@ DENG2_PIMPL(ServerLink) dlg->open(MessageDialog::Modal); } - DENG2_PIMPL_AUDIENCE(DiscoveryUpdate) - DENG2_PIMPL_AUDIENCE(PingResponse) - DENG2_PIMPL_AUDIENCE(MapOutline) - DENG2_PIMPL_AUDIENCE(Join) - DENG2_PIMPL_AUDIENCE(Leave) + DE_PIMPL_AUDIENCE(DiscoveryUpdate) + DE_PIMPL_AUDIENCE(PingResponse) + DE_PIMPL_AUDIENCE(MapOutline) + DE_PIMPL_AUDIENCE(Join) + DE_PIMPL_AUDIENCE(Leave) }; -DENG2_AUDIENCE_METHOD(ServerLink, DiscoveryUpdate) -DENG2_AUDIENCE_METHOD(ServerLink, PingResponse) -DENG2_AUDIENCE_METHOD(ServerLink, MapOutline) -DENG2_AUDIENCE_METHOD(ServerLink, Join) -DENG2_AUDIENCE_METHOD(ServerLink, Leave) +DE_AUDIENCE_METHOD(ServerLink, DiscoveryUpdate) +DE_AUDIENCE_METHOD(ServerLink, PingResponse) +DE_AUDIENCE_METHOD(ServerLink, MapOutline) +DE_AUDIENCE_METHOD(ServerLink, Join) +DE_AUDIENCE_METHOD(ServerLink, Leave) ServerLink::ServerLink(Flags flags) : d(new Impl(this, flags)) { @@ -499,7 +499,7 @@ void ServerLink::acquireServerProfileAsync(Address const &address, // We already know everything that is needed for the profile. d->deferred.enqueue([this, resultHandler] () { - DENG2_ASSERT(d->serverProfile.get() != nullptr); + DE_ASSERT(d->serverProfile.get() != nullptr); resultHandler(d->serverProfile.get()); }); } @@ -579,7 +579,7 @@ void ServerLink::disconnect() if (gx.NetDisconnect) gx.NetDisconnect(true); - DENG2_FOR_AUDIENCE2(Leave, i) i->networkGameLeft(); + DE_FOR_AUDIENCE2(Leave, i) i->networkGameLeft(); LOG_NET_NOTE("Link to server %s disconnected") << address(); d->downloader.unmountServerRepository(); @@ -714,7 +714,7 @@ void ServerLink::initiateCommunications() break; } default: - DENG2_ASSERT(false); + DE_ASSERT(false); break; } } @@ -769,7 +769,7 @@ void ServerLink::handleIncomingPackets() for (TimeSpan i : d->pings) average += i; average /= d->pings.count(); - DENG2_FOR_AUDIENCE2(PingResponse, i) + DE_FOR_AUDIENCE2(PingResponse, i) { i->pingResponse(svAddress, average); } diff --git a/doomsday/apps/client/src/render/angleclipper.cpp b/doomsday/apps/client/src/render/angleclipper.cpp index bde4612655..5f6a1bd3e2 100644 --- a/doomsday/apps/client/src/render/angleclipper.cpp +++ b/doomsday/apps/client/src/render/angleclipper.cpp @@ -101,18 +101,18 @@ namespace internal */ void release(Element *elem) { - DENG2_ASSERT(_last); + DE_ASSERT(_last); if(elem == _last) { - DENG2_ASSERT(!_rover); + DE_ASSERT(!_rover); // We can only remove the last if all elements are already in use. _rover = elem; return; } - DENG2_ASSERT(elem->_next); + DE_ASSERT(elem->_next); // Unlink from the list entirely. elem->_next->_prev = elem->_prev; @@ -148,7 +148,7 @@ namespace internal } // namespace internal using namespace ::internal; -DENG2_PIMPL_NOREF(AngleClipper) +DE_PIMPL_NOREF(AngleClipper) { /// Specialized AngleRange for half-space clipping. struct Clipper : public ElementPool::Element, AngleRange @@ -182,7 +182,7 @@ DENG2_PIMPL_NOREF(AngleClipper) template void clearRangeList(NodeType **head) { - DENG2_ASSERT(head); + DE_ASSERT(head); while(*head) { auto *next = static_cast((*head)->next); @@ -293,7 +293,7 @@ DENG2_PIMPL_NOREF(AngleClipper) return; // The new range already exists. } -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG if(i == i->next) throw Error("AngleClipper::addRange", String("loop1 0x%1 linked to itself: %2 => %3") .arg((quintptr)i, QT_POINTER_SIZE * 2, 16, QChar('0')) @@ -546,18 +546,18 @@ DENG2_PIMPL_NOREF(AngleClipper) // The range has to be added in two parts. addOcclusionRange(startAngle, BANG_MAX, normal, tophalf); - DENG2_DEBUG_ONLY(occlusionRanger(3)); + DE_DEBUG_ONLY(occlusionRanger(3)); addOcclusionRange(0, endAngle, normal, tophalf); - DENG2_DEBUG_ONLY(occlusionRanger(4)); + DE_DEBUG_ONLY(occlusionRanger(4)); } else { // Add the range as usual. addOcclusionRange(startAngle, endAngle, normal, tophalf); - DENG2_DEBUG_ONLY(occlusionRanger(5)); + DE_DEBUG_ONLY(occlusionRanger(5)); } } @@ -650,7 +650,7 @@ DENG2_PIMPL_NOREF(AngleClipper) */ void cutOcclusionRange(binangle_t from, binangle_t to) { - DENG2_DEBUG_ONLY(occlusionRanger(1)); + DE_DEBUG_ONLY(occlusionRanger(1)); // Find the range after which it's OK to add oranges cut in half. // (Must preserve the ascending order of the start angles.) We want the @@ -733,14 +733,14 @@ DENG2_PIMPL_NOREF(AngleClipper) orange = next; } - DENG2_DEBUG_ONLY(occlusionRanger(2)); + DE_DEBUG_ONLY(occlusionRanger(2)); mergeOccludes(); - DENG2_DEBUG_ONLY(occlusionRanger(6)); + DE_DEBUG_ONLY(occlusionRanger(6)); } -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG void occlusionLister() { for(Occluder *orange = occHead; orange; orange = orange->next) @@ -748,7 +748,7 @@ DENG2_PIMPL_NOREF(AngleClipper) LOG_MSG(String("from: %1 to: %2 topHalf: %3") .arg(orange->from, 0, 16) .arg(orange->to, 0, 16) - .arg(DENG2_BOOL_YESNO(orange->topHalf))); + .arg(DE_BOOL_YESNO(orange->topHalf))); } } @@ -818,7 +818,7 @@ dint AngleClipper::isPointVisible(Vec3d const &point) const dint AngleClipper::isPolyVisible(Face const &poly) const { - DENG2_ASSERT(poly.isConvex()); + DE_ASSERT(poly.isConvex()); if(::devNoCulling) return true; @@ -918,14 +918,14 @@ void AngleClipper::addViewRelOcclusion(Vec2d const &from, Vec2d const &to, // The normal points to the half we want to occlude. Vec3f const normal = (topHalf? eyeToV2 : eyeToV1).cross(topHalf? eyeToV1 : eyeToV2); -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG if(Vec3f(0, 0, (topHalf ? 1000 : -1000)).dot(normal) < 0) { LOG_AS("AngleClipper::addViewRelOcclusion"); LOGDEV_GL_WARNING("Wrong side v1:%s v2:%s eyeOrigin:%s!") << from.asText() << to.asText() << Vec2d(eyeOrigin).asText(); - DENG2_ASSERT_FAIL("Failed AngleClipper::addViewRelOcclusion: Side test"); + DE_ASSERT_FAIL("Failed AngleClipper::addViewRelOcclusion: Side test"); } #endif @@ -942,7 +942,7 @@ dint AngleClipper::checkRangeFromViewRelPoints(Vec2d const &from, Vec2d const &t pointToAngle(from - eyeOrigin) + BANG_45/90); } -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG void AngleClipper::validate() { for(Impl::Clipper *i = d->clipHead; i; i = i->next) diff --git a/doomsday/apps/client/src/render/api_render.cpp b/doomsday/apps/client/src/render/api_render.cpp index b8e395b29b..ec4082eddb 100644 --- a/doomsday/apps/client/src/render/api_render.cpp +++ b/doomsday/apps/client/src/render/api_render.cpp @@ -17,7 +17,7 @@ * http://www.gnu.org/licenses */ -#define DENG_NO_API_MACROS_RENDER +#define DE_NO_API_MACROS_RENDER #ifndef __CLIENT__ # error "api_render.cpp is for the client only" @@ -48,10 +48,10 @@ using namespace de; // m_misc.c #undef M_ScreenShot -DENG_EXTERN_C dint M_ScreenShot(char const *name, dint flags); +DE_EXTERN_C dint M_ScreenShot(char const *name, dint flags); #undef Models_CacheForState -DENG_EXTERN_C void Models_CacheForState(dint stateIndex) +DE_EXTERN_C void Models_CacheForState(dint stateIndex) { if (FrameModelDef *modelDef = App_Resources().modelDefForState(stateIndex)) { @@ -61,10 +61,10 @@ DENG_EXTERN_C void Models_CacheForState(dint stateIndex) // r_draw.cpp #undef R_SetBorderGfx -DENG_EXTERN_C void R_SetBorderGfx(struct uri_s const *const *paths); +DE_EXTERN_C void R_SetBorderGfx(struct uri_s const *const *paths); #undef Rend_CacheForMobjType -DENG_EXTERN_C void Rend_CacheForMobjType(dint num) +DE_EXTERN_C void Rend_CacheForMobjType(dint num) { LOG_AS("Rend.CacheForMobjType"); @@ -107,22 +107,22 @@ DENG_EXTERN_C void Rend_CacheForMobjType(dint num) #undef R_SetViewPortPlayer // r_main.cpp -DENG_EXTERN_C void R_RenderPlayerView(dint num); -DENG_EXTERN_C void R_SetViewOrigin(dint consoleNum, coord_t const origin[3]); -DENG_EXTERN_C void R_SetViewAngle(dint consoleNum, angle_t angle); -DENG_EXTERN_C void R_SetViewPitch(dint consoleNum, dfloat pitch); -DENG_EXTERN_C dint R_ViewWindowGeometry(dint consoleNum, RectRaw *geometry); -DENG_EXTERN_C dint R_ViewWindowOrigin(dint consoleNum, Point2Raw *origin); -DENG_EXTERN_C dint R_ViewWindowSize(dint consoleNum, Size2Raw *size); -DENG_EXTERN_C void R_SetViewWindowGeometry(dint consoleNum, RectRaw const *geometry, dd_bool interpolate); -DENG_EXTERN_C dint R_ViewPortGeometry(dint consoleNum, RectRaw *geometry); -DENG_EXTERN_C dint R_ViewPortOrigin(dint consoleNum, Point2Raw *origin); -DENG_EXTERN_C dint R_ViewPortSize(dint consoleNum, Size2Raw *size); -DENG_EXTERN_C void R_SetViewPortPlayer(dint consoleNum, dint viewPlayer); +DE_EXTERN_C void R_RenderPlayerView(dint num); +DE_EXTERN_C void R_SetViewOrigin(dint consoleNum, coord_t const origin[3]); +DE_EXTERN_C void R_SetViewAngle(dint consoleNum, angle_t angle); +DE_EXTERN_C void R_SetViewPitch(dint consoleNum, dfloat pitch); +DE_EXTERN_C dint R_ViewWindowGeometry(dint consoleNum, RectRaw *geometry); +DE_EXTERN_C dint R_ViewWindowOrigin(dint consoleNum, Point2Raw *origin); +DE_EXTERN_C dint R_ViewWindowSize(dint consoleNum, Size2Raw *size); +DE_EXTERN_C void R_SetViewWindowGeometry(dint consoleNum, RectRaw const *geometry, dd_bool interpolate); +DE_EXTERN_C dint R_ViewPortGeometry(dint consoleNum, RectRaw *geometry); +DE_EXTERN_C dint R_ViewPortOrigin(dint consoleNum, Point2Raw *origin); +DE_EXTERN_C dint R_ViewPortSize(dint consoleNum, Size2Raw *size); +DE_EXTERN_C void R_SetViewPortPlayer(dint consoleNum, dint viewPlayer); // sky.cpp #undef R_SkyParams -DENG_EXTERN_C void R_SkyParams(dint layer, dint param, void *data); +DE_EXTERN_C void R_SkyParams(dint layer, dint param, void *data); static inline MaterialVariantSpec const &pspriteMaterialSpec_GetSpriteInfo() { @@ -131,7 +131,7 @@ static inline MaterialVariantSpec const &pspriteMaterialSpec_GetSpriteInfo() } #undef R_GetSpriteInfo -DENG_EXTERN_C dd_bool R_GetSpriteInfo(dint id, dint frame, spriteinfo_t *info) +DE_EXTERN_C dd_bool R_GetSpriteInfo(dint id, dint frame, spriteinfo_t *info) { if (!info) return false; @@ -183,14 +183,14 @@ DENG_EXTERN_C dd_bool R_GetSpriteInfo(dint id, dint frame, spriteinfo_t *info) #undef R_ChooseScaleMode // r_util.c -DENG_EXTERN_C dd_bool R_ChooseAlignModeAndScaleFactor(dfloat *scale, dint width, dint height, dint availWidth, dint availHeight, scalemode_t scaleMode); -DENG_EXTERN_C scalemode_t R_ChooseScaleMode2(dint width, dint height, dint availWidth, dint availHeight, scalemode_t overrideMode, dfloat stretchEpsilon); -DENG_EXTERN_C scalemode_t R_ChooseScaleMode(dint width, dint height, dint availWidth, dint availHeight, scalemode_t overrideMode); +DE_EXTERN_C dd_bool R_ChooseAlignModeAndScaleFactor(dfloat *scale, dint width, dint height, dint availWidth, dint availHeight, scalemode_t scaleMode); +DE_EXTERN_C scalemode_t R_ChooseScaleMode2(dint width, dint height, dint availWidth, dint availHeight, scalemode_t overrideMode, dfloat stretchEpsilon); +DE_EXTERN_C scalemode_t R_ChooseScaleMode(dint width, dint height, dint availWidth, dint availHeight, scalemode_t overrideMode); #undef R_SetupFog -DENG_EXTERN_C void R_SetupFog(dfloat start, dfloat end, dfloat density, dfloat const *rgb) +DE_EXTERN_C void R_SetupFog(dfloat start, dfloat end, dfloat density, dfloat const *rgb) { - DENG2_ASSERT(rgb); + DE_ASSERT(rgb); Con_Execute(CMDS_DDAY, "fog on", true, false); Con_Executef(CMDS_DDAY, true, "fog start %f", start); Con_Executef(CMDS_DDAY, true, "fog end %f", end); @@ -200,13 +200,13 @@ DENG_EXTERN_C void R_SetupFog(dfloat start, dfloat end, dfloat density, dfloat c } #undef R_SetupFogDefaults -DENG_EXTERN_C void R_SetupFogDefaults() +DE_EXTERN_C void R_SetupFogDefaults() { // Go with the defaults. Con_Execute(CMDS_DDAY, "fog off", true, false); } -DENG_DECLARE_API(Rend) = +DE_DECLARE_API(Rend) = { { DE_API_RENDER }, R_SetupFogDefaults, diff --git a/doomsday/apps/client/src/render/billboard.cpp b/doomsday/apps/client/src/render/billboard.cpp index 2619ad5e02..4dc023eb0e 100644 --- a/doomsday/apps/client/src/render/billboard.cpp +++ b/doomsday/apps/client/src/render/billboard.cpp @@ -75,14 +75,14 @@ static inline void drawQuad(dgl_vertex_t *v, dgl_color_t *c, dgl_texcoord_t *tc) void Rend_DrawMaskedWall(drawmaskedwallparams_t const &parms) { - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); TextureVariant *tex = nullptr; if(::renderTextures) { MaterialAnimator *matAnimator = parms.animator; - DENG2_ASSERT(matAnimator); + DE_ASSERT(matAnimator); // Ensure we have up to date info about the material. matAnimator->prepare(); @@ -242,7 +242,7 @@ static void applyUniformColor(dint count, dgl_color_t *colors, dfloat const *rgb static void Spr_VertexColors(dint count, dgl_color_t *out, dgl_vertex_t *normals, duint lightListIdx, dint maxLights, dfloat const *_ambient) { - DENG2_ASSERT(out && normals && _ambient); + DE_ASSERT(out && normals && _ambient); dbyte const opacity = 255 * _ambient[3]; Vec3f const ambient(_ambient); @@ -296,8 +296,8 @@ MaterialVariantSpec const &PSprite_MaterialSpec() void Rend_DrawPSprite(rendpspriteparams_t const &parms) { - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); if(::renderTextures == 1) { @@ -395,8 +395,8 @@ void Rend_DrawSprite(vissprite_t const &spr) { drawspriteparams_t const &parm = *VS_SPRITE(&spr); - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); TextureVariant *tex = nullptr; Vec2f size; diff --git a/doomsday/apps/client/src/render/blockmapvisual.cpp b/doomsday/apps/client/src/render/blockmapvisual.cpp index c4c8a7562b..ab511a7a9b 100644 --- a/doomsday/apps/client/src/render/blockmapvisual.cpp +++ b/doomsday/apps/client/src/render/blockmapvisual.cpp @@ -67,7 +67,7 @@ static void drawLine(Line const &line) static void drawSubspace(ConvexSubspace const &subspace) { dfloat const scale = de::max(bmapDebugSize, 1.f); - dfloat const width = (DENG_GAMEVIEW_WIDTH / 16) / scale; + dfloat const width = (DE_GAMEVIEW_WIDTH / 16) / scale; Face const &poly = subspace.poly(); HEdge *base = poly.hedge(); @@ -541,8 +541,8 @@ void Rend_BlockmapDebug() break; } - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); /* * Draw the blockmap. @@ -550,12 +550,12 @@ void Rend_BlockmapDebug() DGL_MatrixMode(DGL_PROJECTION); DGL_PushMatrix(); DGL_LoadIdentity(); - DGL_Ortho(0, 0, DENG_GAMEVIEW_WIDTH, DENG_GAMEVIEW_HEIGHT, -1, 1); + DGL_Ortho(0, 0, DE_GAMEVIEW_WIDTH, DE_GAMEVIEW_HEIGHT, -1, 1); // Orient on the center of the window. - DGL_Translatef((DENG_GAMEVIEW_WIDTH / 2), (DENG_GAMEVIEW_HEIGHT / 2), 0); + DGL_Translatef((DE_GAMEVIEW_WIDTH / 2), (DE_GAMEVIEW_HEIGHT / 2), 0); // Uniform scaling factor for this visual. - float scale = bmapDebugSize / de::max(DENG_GAMEVIEW_HEIGHT / 100, 1); + float scale = bmapDebugSize / de::max(DE_GAMEVIEW_HEIGHT / 100, 1); DGL_Scalef(scale, -scale, 1); // If possible we'll tailor what we draw relative to the viewPlayer. @@ -577,7 +577,7 @@ void Rend_BlockmapDebug() DGL_MatrixMode(DGL_PROJECTION); DGL_PushMatrix(); DGL_LoadIdentity(); - DGL_Ortho(0, 0, DENG_GAMEVIEW_WIDTH, DENG_GAMEVIEW_HEIGHT, -1, 1); + DGL_Ortho(0, 0, DE_GAMEVIEW_WIDTH, DE_GAMEVIEW_HEIGHT, -1, 1); if (followMobj) { @@ -586,13 +586,13 @@ void Rend_BlockmapDebug() BlockmapCell cell = blockmap->toCell(followMobj->origin, &didClip); if (!didClip) { - drawCellInfoBox(Vec2d(DENG_GAMEVIEW_WIDTH / 2, 30), *blockmap, + drawCellInfoBox(Vec2d(DE_GAMEVIEW_WIDTH / 2, 30), *blockmap, objectTypeName, cell); } } // About the Blockmap itself. - drawBlockmapInfo(Vec2d(DENG_GAMEVIEW_WIDTH - 10, DENG_GAMEVIEW_HEIGHT - 10), + drawBlockmapInfo(Vec2d(DE_GAMEVIEW_WIDTH - 10, DE_GAMEVIEW_HEIGHT - 10), *blockmap); DGL_MatrixMode(DGL_PROJECTION); diff --git a/doomsday/apps/client/src/render/consoleeffect.cpp b/doomsday/apps/client/src/render/consoleeffect.cpp index 21b507ab65..8ec04118a0 100644 --- a/doomsday/apps/client/src/render/consoleeffect.cpp +++ b/doomsday/apps/client/src/render/consoleeffect.cpp @@ -24,7 +24,7 @@ using namespace de; -DENG2_PIMPL_NOREF(ConsoleEffect) +DE_PIMPL_NOREF(ConsoleEffect) { int console; bool inited; diff --git a/doomsday/apps/client/src/render/decoration.cpp b/doomsday/apps/client/src/render/decoration.cpp index a6a41158b4..c870b575eb 100644 --- a/doomsday/apps/client/src/render/decoration.cpp +++ b/doomsday/apps/client/src/render/decoration.cpp @@ -27,7 +27,7 @@ using namespace de; -DENG2_PIMPL_NOREF(Decoration) +DE_PIMPL_NOREF(Decoration) { MaterialAnimator::Decoration const *source = nullptr; Surface *surface = nullptr; @@ -52,7 +52,7 @@ String Decoration::description() const .arg(source().decor().material().manifest().composeUri().asText()) .arg(String("[0x%1]").arg(de::dintptr(&surface()), 0, 16)); -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG desc.prepend(String(_E(b) "Decoration " _E(.) "[0x%1]\n").arg(de::dintptr(this), 0, 16)); #endif return desc; @@ -60,7 +60,7 @@ String Decoration::description() const MaterialAnimator::Decoration const &Decoration::source() const { - DENG2_ASSERT(d->source); + DE_ASSERT(d->source); return *d->source; } diff --git a/doomsday/apps/client/src/render/drawlist.cpp b/doomsday/apps/client/src/render/drawlist.cpp index 7ff1e2353b..f1b63e8a01 100644 --- a/doomsday/apps/client/src/render/drawlist.cpp +++ b/doomsday/apps/client/src/render/drawlist.cpp @@ -84,7 +84,7 @@ DrawList::PrimitiveParams::PrimitiveParams(de::gl::Primitive type, , modColor (modColor) {} -DENG2_PIMPL(DrawList) +DE_PIMPL(DrawList) { /** * Each Element begins a block of GL commands/geometry to apply/transfer. @@ -116,7 +116,7 @@ DENG2_PIMPL(DrawList) */ void draw(DrawConditions const &conditions, TexUnitMap const &texUnitMap) { - DENG2_ASSERT(buffer); + DE_ASSERT(buffer); if (conditions & SetLightEnv) { @@ -271,7 +271,7 @@ DENG2_PIMPL(DrawList) { // All the list data will be destroyed. Z_Free(data); data = nullptr; -#ifdef DENG_DEBUG +#ifdef DE_DEBUG Z_CheckHeap(); #endif } @@ -358,13 +358,13 @@ DENG2_PIMPL(DrawList) switch (mode) { case DM_SKYMASK: - DENG2_ASSERT(spec.group == SkyMaskGeom); + DE_ASSERT(spec.group == SkyMaskGeom); // Render all primitives on the list without discrimination. return NoColor; case DM_ALL: // All surfaces. - DENG2_ASSERT(spec.group == UnlitGeom || spec.group == LitGeom); + DE_ASSERT(spec.group == UnlitGeom || spec.group == LitGeom); // Should we do blending? if (spec.unit(TU_INTER).hasTexture()) @@ -399,27 +399,27 @@ DENG2_PIMPL(DrawList) return SetMatrixTexture0; case DM_LIGHT_MOD_TEXTURE: - DENG2_ASSERT(spec.group == LitGeom); + DE_ASSERT(spec.group == LitGeom); // Modulate sector light, dynamic light and regular texture. GL_BindTo(spec.unit(TU_PRIMARY), 1); return SetMatrixTexture1 | SetLightEnv0 | JustOneLight | NoBlend; case DM_TEXTURE_PLUS_LIGHT: - DENG2_ASSERT(spec.group == LitGeom); + DE_ASSERT(spec.group == LitGeom); GL_BindTo(spec.unit(TU_PRIMARY), 0); return SetMatrixTexture0 | SetLightEnv1 | NoBlend; case DM_FIRST_LIGHT: - DENG2_ASSERT(spec.group == LitGeom); + DE_ASSERT(spec.group == LitGeom); // Draw all primitives with more than one light // and all primitives which will have a blended texture. return SetLightEnv0 | ManyLights | Blend; case DM_BLENDED: { - DENG2_ASSERT(spec.group == UnlitGeom || spec.group == LitGeom); + DE_ASSERT(spec.group == UnlitGeom || spec.group == LitGeom); // Only render the blended surfaces. if (!spec.unit(TU_INTER).hasTexture()) @@ -437,7 +437,7 @@ DENG2_PIMPL(DrawList) return SetMatrixTexture0 | SetMatrixTexture1; } case DM_BLENDED_FIRST_LIGHT: - DENG2_ASSERT(spec.group == LitGeom); + DE_ASSERT(spec.group == LitGeom); // Only blended surfaces. if (!spec.unit(TU_INTER).hasTexture()) @@ -447,20 +447,20 @@ DENG2_PIMPL(DrawList) return SetMatrixTexture1 | SetLightEnv0; case DM_WITHOUT_TEXTURE: - DENG2_ASSERT(spec.group == LitGeom); + DE_ASSERT(spec.group == LitGeom); // Only render geometries affected by dynlights. return 0; case DM_LIGHTS: - DENG2_ASSERT(spec.group == LightGeom); + DE_ASSERT(spec.group == LightGeom); // These lists only contain light geometries. GL_Bind(spec.unit(TU_PRIMARY)); return 0; case DM_BLENDED_MOD_TEXTURE: - DENG2_ASSERT(spec.group == LitGeom); + DE_ASSERT(spec.group == LitGeom); // Blending required. if (!spec.unit(TU_INTER).hasTexture()) @@ -472,7 +472,7 @@ DENG2_PIMPL(DrawList) case DM_MOD_TEXTURE: case DM_MOD_TEXTURE_MANY_LIGHTS: - DENG2_ASSERT(spec.group == LitGeom); + DE_ASSERT(spec.group == LitGeom); // Texture for surfaces with (many) dynamic lights. // Should we do blending? @@ -501,7 +501,7 @@ DENG2_PIMPL(DrawList) return SetMatrixTexture0; case DM_UNBLENDED_MOD_TEXTURE_AND_DETAIL: - DENG2_ASSERT(spec.group == LitGeom); + DE_ASSERT(spec.group == LitGeom); // Blending is not done now. if (spec.unit(TU_INTER).hasTexture()) @@ -527,7 +527,7 @@ DENG2_PIMPL(DrawList) break; case DM_ALL_DETAILS: - DENG2_ASSERT(spec.group == UnlitGeom || spec.group == LitGeom); + DE_ASSERT(spec.group == UnlitGeom || spec.group == LitGeom); if (spec.unit(TU_PRIMARY_DETAIL).hasTexture()) { @@ -537,7 +537,7 @@ DENG2_PIMPL(DrawList) break; case DM_UNBLENDED_TEXTURE_AND_DETAIL: - DENG2_ASSERT(spec.group == UnlitGeom || spec.group == LitGeom); + DE_ASSERT(spec.group == UnlitGeom || spec.group == LitGeom); // Only unblended. Details are optional. if (spec.unit(TU_INTER).hasTexture()) @@ -564,7 +564,7 @@ DENG2_PIMPL(DrawList) break; case DM_BLENDED_DETAILS: { - DENG2_ASSERT(spec.group == UnlitGeom || spec.group == LitGeom); + DE_ASSERT(spec.group == UnlitGeom || spec.group == LitGeom); // We'll only render blended primitives. if (!spec.unit(TU_INTER).hasTexture()) @@ -586,7 +586,7 @@ DENG2_PIMPL(DrawList) return SetMatrixDTexture0 | SetMatrixDTexture1; } case DM_SHADOW: - DENG2_ASSERT(spec.group == ShadowGeom); + DE_ASSERT(spec.group == ShadowGeom); if (spec.unit(TU_PRIMARY).hasTexture()) { @@ -611,7 +611,7 @@ DENG2_PIMPL(DrawList) return 0; case DM_MASKED_SHINY: - DENG2_ASSERT(spec.group == ShineGeom); + DE_ASSERT(spec.group == ShineGeom); if (spec.unit(TU_INTER).hasTexture()) { @@ -626,7 +626,7 @@ DENG2_PIMPL(DrawList) case DM_ALL_SHINY: case DM_SHINY: - DENG2_ASSERT(spec.group == ShineGeom); + DE_ASSERT(spec.group == ShineGeom); GL_BindTo(spec.unit(TU_PRIMARY), 0); if (!spec.unit(TU_INTER).hasTexture()) @@ -769,16 +769,16 @@ DrawList &DrawList::write(Store const &buffer, duint const *indices, int indexCo DrawList &DrawList::write(Store const &buffer, duint const *indices, int indexCount, PrimitiveParams const ¶ms) { -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG using Parm = PrimitiveParams; // Sanity check usage. - DENG2_ASSERT(!(spec().group == LightGeom && ((params.flags_blendMode & Parm::OneLight) || + DE_ASSERT(!(spec().group == LightGeom && ((params.flags_blendMode & Parm::OneLight) || (params.flags_blendMode & Parm::ManyLights) || params.modTexture))); - DENG2_ASSERT(!(spec().group == LitGeom && !Rend_IsMTexLights() && ((params.flags_blendMode & Parm::OneLight) || + DE_ASSERT(!(spec().group == LitGeom && !Rend_IsMTexLights() && ((params.flags_blendMode & Parm::OneLight) || params.modTexture))); - DENG2_ASSERT(!(spec().group == ShadowGeom && ((params.flags_blendMode & Parm::OneLight) || + DE_ASSERT(!(spec().group == ShadowGeom && ((params.flags_blendMode & Parm::OneLight) || (params.flags_blendMode & Parm::ManyLights) || params.modTexture))); #endif @@ -795,7 +795,7 @@ DrawList &DrawList::write(Store const &buffer, duint const *indices, int indexCo d->last->data.numIndices = indexCount; auto *lti = (duint *) d->allocateData(sizeof(duint) * d->last->data.numIndices); - DENG_ASSERT(d->last != nullptr); + DE_ASSERT(d->last != nullptr); d->last->data.indices = lti; for (duint i = 0; i < d->last->data.numIndices; ++i) { @@ -815,8 +815,8 @@ void DrawList::draw(DrawMode mode, TexUnitMap const &texUnitMap) const { using Parm = PrimitiveParams; - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); // Setup GL state for this list. DrawConditions const conditions = d->pushGLState(mode); @@ -876,7 +876,7 @@ void DrawList::draw(DrawMode mode, TexUnitMap const &texUnitMap) const { elem->data.draw(conditions, texUnitMap); - DENG2_ASSERT(!Sys_GLCheckError()); + DE_ASSERT(!Sys_GLCheckError()); } } diff --git a/doomsday/apps/client/src/render/drawlists.cpp b/doomsday/apps/client/src/render/drawlists.cpp index 0ae307558f..d0aca7a8fc 100644 --- a/doomsday/apps/client/src/render/drawlists.cpp +++ b/doomsday/apps/client/src/render/drawlists.cpp @@ -30,7 +30,7 @@ using namespace de; typedef QMultiHash DrawListHash; -DENG2_PIMPL(DrawLists) +DE_PIMPL(DrawLists) { QScopedPointer skyMaskList; DrawListHash unlitHash; @@ -59,7 +59,7 @@ DENG2_PIMPL(DrawLists) case SkyMaskGeom: break; // n/a? } - DENG2_ASSERT(false); + DE_ASSERT(false); return unlitHash; } }; diff --git a/doomsday/apps/client/src/render/environ.cpp b/doomsday/apps/client/src/render/environ.cpp index 34e0b590cb..8be4ac1ab0 100644 --- a/doomsday/apps/client/src/render/environ.cpp +++ b/doomsday/apps/client/src/render/environ.cpp @@ -36,9 +36,9 @@ static String const DEF_EXTERIOR_PATH("exterior.path"); namespace render { -DENG2_PIMPL(Environment) -, DENG2_OBSERVES(filesys::AssetObserver, Availability) -, DENG2_OBSERVES(World, MapChange) +DE_PIMPL(Environment) +, DE_OBSERVES(filesys::AssetObserver, Availability) +, DE_OBSERVES(World, MapChange) { enum { Interior, Exterior }; @@ -155,7 +155,7 @@ DENG2_PIMPL(Environment) void loadTexturesForCurrentMap() { - DENG2_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_IN_MAIN_THREAD(); release(); @@ -180,7 +180,7 @@ DENG2_PIMPL(Environment) void loadEnvMaps(EnvMaps const &env) { - DENG2_ASSERT(!(env.interior.isEmpty() && env.exterior.isEmpty())); + DE_ASSERT(!(env.interior.isEmpty() && env.exterior.isEmpty())); if (!env.exterior.isEmpty()) { loadCubeMap(reflectionTextures[Exterior], env.exterior); diff --git a/doomsday/apps/client/src/render/fx/bloom.cpp b/doomsday/apps/client/src/render/fx/bloom.cpp index 5ee04efeb4..cefb2ae154 100644 --- a/doomsday/apps/client/src/render/fx/bloom.cpp +++ b/doomsday/apps/client/src/render/fx/bloom.cpp @@ -35,7 +35,7 @@ static float bloomThreshold = .35f; static float bloomDispersion = 1; static int bloomComplexity = 1; -DENG2_PIMPL(Bloom) +DE_PIMPL(Bloom) { typedef GLBufferT VBuf; diff --git a/doomsday/apps/client/src/render/fx/colorfilter.cpp b/doomsday/apps/client/src/render/fx/colorfilter.cpp index 0c10a38a57..9664bab77e 100644 --- a/doomsday/apps/client/src/render/fx/colorfilter.cpp +++ b/doomsday/apps/client/src/render/fx/colorfilter.cpp @@ -31,13 +31,13 @@ static bool drawFilter = false; static Vec4f filterColor; #undef GL_SetFilter -DENG_EXTERN_C void GL_SetFilter(dd_bool enabled) +DE_EXTERN_C void GL_SetFilter(dd_bool enabled) { drawFilter = CPP_BOOL(enabled); } #undef GL_SetFilterColor -DENG_EXTERN_C void GL_SetFilterColor(float r, float g, float b, float a) +DE_EXTERN_C void GL_SetFilterColor(float r, float g, float b, float a) { Vec4f newColorClamped(de::clamp(0.f, r, 1.f), de::clamp(0.f, g, 1.f), diff --git a/doomsday/apps/client/src/render/fx/lensflares.cpp b/doomsday/apps/client/src/render/fx/lensflares.cpp index 4167ee2295..aaebce057a 100644 --- a/doomsday/apps/client/src/render/fx/lensflares.cpp +++ b/doomsday/apps/client/src/render/fx/lensflares.cpp @@ -72,8 +72,8 @@ struct FlareData { try { - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); images.addFromInfo(App::rootFolder().locate("/packs/feature.lensflares/images.dei")); @@ -95,8 +95,8 @@ struct FlareData ~FlareData() { - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); LOGDEV_GL_XVERBOSE("Releasing shared data", ""); } @@ -218,7 +218,7 @@ static float linearRangeFactor(float value, Rangef const &low, Rangef const &hig return 1; } -DENG2_PIMPL(LensFlares) +DE_PIMPL(LensFlares) { typedef Shared SharedFlareData; SharedFlareData *res; @@ -264,7 +264,7 @@ DENG2_PIMPL(LensFlares) ~Impl() { - DENG2_ASSERT(res == 0); // should have been deinited + DE_ASSERT(res == 0); // should have been deinited releaseRef(res); clearPvs(); } @@ -519,8 +519,8 @@ void LensFlares::draw() d->uPixelAsUv = Vec2f(1.f / window.pixelWidth(), 1.f / window.pixelHeight()); d->uMvpMatrix = Viewer_Matrix(); //Rend_GetProjectionMatrix() * Rend_GetModelViewMatrix(console()); - DENG2_ASSERT(console() == displayPlayer); - //DENG2_ASSERT(viewPlayer - ddPlayers == displayPlayer); + DE_ASSERT(console() == displayPlayer); + //DE_ASSERT(viewPlayer - ddPlayers == displayPlayer); if (DoomsdayApp::players().indexOf(viewPlayer) != displayPlayer) { qDebug() << "LensFrames::draw: viewPlayer != displayPlayer"; @@ -562,4 +562,4 @@ void LensFlares::consoleRegister() } // namespace fx -DENG2_SHARED_INSTANCE(fx::FlareData) +DE_SHARED_INSTANCE(fx::FlareData) diff --git a/doomsday/apps/client/src/render/lightdecoration.cpp b/doomsday/apps/client/src/render/lightdecoration.cpp index 5f231c3299..97ff10dfbe 100644 --- a/doomsday/apps/client/src/render/lightdecoration.cpp +++ b/doomsday/apps/client/src/render/lightdecoration.cpp @@ -46,7 +46,7 @@ LightDecoration::LightDecoration(MaterialAnimator::Decoration const &source, Vec String LightDecoration::description() const { String desc; -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG desc.prepend(String(_E(b) "LightDecoration " _E(.) "[0x%1]\n").arg(de::dintptr(this), 0, 16)); #endif return Decoration::description() + "\n" + desc; diff --git a/doomsday/apps/client/src/render/lumobj.cpp b/doomsday/apps/client/src/render/lumobj.cpp index 1f71041bb9..64bb93179e 100644 --- a/doomsday/apps/client/src/render/lumobj.cpp +++ b/doomsday/apps/client/src/render/lumobj.cpp @@ -39,7 +39,7 @@ dfloat Lumobj::Source::occlusion(Vec3d const & /*eye*/) const return 1; // Fully visible. } -DENG2_PIMPL_NOREF(Lumobj) +DE_PIMPL_NOREF(Lumobj) { Source const *source = nullptr; ///< Source of the lumobj (if any, not owned). mobj_t const *sourceMobj = nullptr; ///< Mobj associated with the lumobj (if any). @@ -168,7 +168,7 @@ ClientTexture *Lumobj::lightmap(LightmapSemantic semantic) const case Down: return d->downTex; case Up: return d->upTex; }; - DENG2_ASSERT(false); + DE_ASSERT(false); return d->sideTex; } diff --git a/doomsday/apps/client/src/render/modelloader.cpp b/doomsday/apps/client/src/render/modelloader.cpp index 6e47ab942a..06ecdc7201 100644 --- a/doomsday/apps/client/src/render/modelloader.cpp +++ b/doomsday/apps/client/src/render/modelloader.cpp @@ -66,11 +66,11 @@ static String const VAR_U_VIEW_MATRIX ("uViewMatrix"); static Atlas::Size const MAX_ATLAS_SIZE (8192, 8192); -DENG2_PIMPL(ModelLoader) -, DENG2_OBSERVES(filesys::AssetObserver, Availability) -, DENG2_OBSERVES(Bank, Load) -, DENG2_OBSERVES(ModelDrawable, AboutToGLInit) -, DENG2_OBSERVES(BusyRunner, DeferredGLTask) +DE_PIMPL(ModelLoader) +, DE_OBSERVES(filesys::AssetObserver, Availability) +, DE_OBSERVES(Bank, Load) +, DE_OBSERVES(ModelDrawable, AboutToGLInit) +, DE_OBSERVES(BusyRunner, DeferredGLTask) , public MultiAtlas::IAtlasFactory { MultiAtlas atlasPool{*this}; @@ -97,18 +97,18 @@ DENG2_PIMPL(ModelLoader) { ~Programs() { -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG for (auto i = constBegin(); i != constEnd(); ++i) { qDebug() << i.key() << i.value(); - DENG2_ASSERT(i.value()); + DE_ASSERT(i.value()); qWarning() << "ModelRenderer: Program" << i.key() << "still has" << i.value()->useCount << "users"; } #endif // Everything should have been unloaded, because all models // have been destroyed at this point. - DENG2_ASSERT(empty()); + DE_ASSERT(empty()); } }; Programs programs; @@ -125,14 +125,14 @@ DENG2_PIMPL(ModelLoader) // request another one. loadProgram(SHADER_DEFAULT); -#if defined (DENG_HAVE_BUSYRUNNER) +#if defined (DE_HAVE_BUSYRUNNER) ClientApp::busyRunner().audienceForDeferredGLTask() += this; #endif } void deinit() { -#if defined (DENG_HAVE_BUSYRUNNER) +#if defined (DE_HAVE_BUSYRUNNER) ClientApp::busyRunner().audienceForDeferredGLTask() -= this; #endif @@ -179,7 +179,7 @@ DENG2_PIMPL(ModelLoader) // Unload programs used by the various rendering passes. for (auto const &pass : model.passes) { - DENG2_ASSERT(pass.program); + DE_ASSERT(pass.program); unloadProgram(*static_cast(pass.program)); } @@ -193,12 +193,12 @@ DENG2_PIMPL(ModelLoader) } else { - DENG2_ASSERT(!model.program()); + DE_ASSERT(!model.program()); } bank.remove(identifier); { - DENG2_GUARD(pendingModels); + DE_GUARD(pendingModels); pendingModels.value.remove(identifier); } } @@ -212,7 +212,7 @@ DENG2_PIMPL(ModelLoader) */ void initPendingModels(int maxCount) { - DENG2_GUARD(pendingModels); + DE_GUARD(pendingModels); while (!pendingModels.value.isEmpty() && maxCount > 0) { @@ -237,7 +237,7 @@ DENG2_PIMPL(ModelLoader) { initPendingModels(1); - DENG2_GUARD(pendingModels); + DE_GUARD(pendingModels); return pendingModels.value.isEmpty()? BusyRunner::AllTasksCompleted : BusyRunner::TasksPending; } @@ -267,7 +267,7 @@ DENG2_PIMPL(ModelLoader) // Bind the mandatory common state. ClientApp::shaders().build(*prog, name); - DENG2_FOR_PUBLIC_AUDIENCE2(NewProgram, i) + DE_FOR_PUBLIC_AUDIENCE2(NewProgram, i) { i->newProgramCreated(*prog); } @@ -305,7 +305,7 @@ DENG2_PIMPL(ModelLoader) String name = program.shaderName; LOG_RES_VERBOSE("Model shader \"%s\" unloaded (no more users)") << name; delete &program; - DENG2_ASSERT(programs.contains(name)); + DE_ASSERT(programs.contains(name)); programs.remove(name); } } @@ -314,7 +314,7 @@ DENG2_PIMPL(ModelLoader) { auto &model = static_cast(drawable); { - DENG2_GUARD(pendingModels); + DE_GUARD(pendingModels); pendingModels.value.remove(model.identifier); } model.setAtlas(*model.textures); @@ -501,7 +501,7 @@ DENG2_PIMPL(ModelLoader) if (asset.has(DEF_ANIMATION)) { auto states = ScriptedInfo::subrecordsOfType(DEF_STATE, asset.subrecord(DEF_ANIMATION)); - DENG2_FOR_EACH_CONST(Record::Subrecords, state, states) + DE_FOR_EACH_CONST(Record::Subrecords, state, states) { // Sequences are added in source order. auto const seqs = ScriptedInfo::subrecordsOfType(DEF_SEQUENCE, *state.value()); @@ -527,7 +527,7 @@ DENG2_PIMPL(ModelLoader) // Timelines. auto timelines = ScriptedInfo::subrecordsOfType(DEF_TIMELINE, asset.subrecord(DEF_ANIMATION)); - DENG2_FOR_EACH_CONST(Record::Subrecords, timeline, timelines) + DE_FOR_EACH_CONST(Record::Subrecords, timeline, timelines) { Timeline *scheduler = new Timeline; scheduler->addFromInfo(*timeline.value()); @@ -624,7 +624,7 @@ DENG2_PIMPL(ModelLoader) // Initialize for rendering at a later time. { - DENG2_GUARD(pendingModels); + DE_GUARD(pendingModels); pendingModels.value.insert(path); } } @@ -697,10 +697,10 @@ DENG2_PIMPL(ModelLoader) } } - DENG2_PIMPL_AUDIENCE(NewProgram) + DE_PIMPL_AUDIENCE(NewProgram) }; -DENG2_AUDIENCE_METHOD(ModelLoader, NewProgram) +DE_AUDIENCE_METHOD(ModelLoader, NewProgram) ModelLoader::ModelLoader() : d(new Impl(this)) diff --git a/doomsday/apps/client/src/render/modelrenderer.cpp b/doomsday/apps/client/src/render/modelrenderer.cpp index 7230db142f..7e1a07f4cb 100644 --- a/doomsday/apps/client/src/render/modelrenderer.cpp +++ b/doomsday/apps/client/src/render/modelrenderer.cpp @@ -43,8 +43,8 @@ static int constexpr MAX_LIGHTS = 4; float weaponFixedFOV = 95.f; -DENG2_PIMPL(ModelRenderer) -, DENG2_OBSERVES(render::ModelLoader, NewProgram) +DE_PIMPL(ModelRenderer) +, DE_OBSERVES(render::ModelLoader, NewProgram) { render::ModelLoader loader; @@ -422,14 +422,14 @@ void ModelRenderer::initBindings(Binder &binder, Record &module) // static { Record &anim = module.addSubrecord("StateAnimator"); binder.init(anim) - << DENG2_FUNC_NOARG(StateAnimator_Thing, "thing") - << DENG2_FUNC_NOARG(StateAnimator_PlayingSequences, "playingSequences") - << DENG2_FUNC_DEFS (StateAnimator_StartSequence, "startSequence", + << DE_FUNC_NOARG(StateAnimator_Thing, "thing") + << DE_FUNC_NOARG(StateAnimator_PlayingSequences, "playingSequences") + << DE_FUNC_DEFS (StateAnimator_StartSequence, "startSequence", "sequence" << "priority" << "looping" << "node", Function::Defaults({ std::make_pair("priority", new NumberValue(0)), std::make_pair("looping", new NumberValue(0)), std::make_pair("node", new TextValue) })) - << DENG2_FUNC (StateAnimator_StartTimeline, "startTimeline", "name") - << DENG2_FUNC (StateAnimator_StopTimeline, "stopTimeline", "name"); + << DE_FUNC (StateAnimator_StartTimeline, "startTimeline", "name") + << DE_FUNC (StateAnimator_StopTimeline, "stopTimeline", "name"); } } diff --git a/doomsday/apps/client/src/render/playerweaponanimator.cpp b/doomsday/apps/client/src/render/playerweaponanimator.cpp index 0adfdbe793..bd59244199 100644 --- a/doomsday/apps/client/src/render/playerweaponanimator.cpp +++ b/doomsday/apps/client/src/render/playerweaponanimator.cpp @@ -34,8 +34,8 @@ using namespace de; namespace render { -DENG2_PIMPL_NOREF(PlayerWeaponAnimator) -, DENG2_OBSERVES(Asset, Deletion) +DE_PIMPL_NOREF(PlayerWeaponAnimator) +, DE_OBSERVES(Asset, Deletion) { ClientPlayer *player; String identifier; @@ -107,13 +107,13 @@ void PlayerWeaponAnimator::stateChanged(state_s const *state) StateAnimator &PlayerWeaponAnimator::animator() { - DENG2_ASSERT(hasModel()); + DE_ASSERT(hasModel()); return *d->animator; } void PlayerWeaponAnimator::setupVisPSprite(vispsprite_t &spr) const { - DENG2_ASSERT(hasModel()); + DE_ASSERT(hasModel()); spr.type = VPSPR_MODEL2; spr.data.model2.model = model(); diff --git a/doomsday/apps/client/src/render/r_draw.cpp b/doomsday/apps/client/src/render/r_draw.cpp index 23bba993a5..429779832f 100644 --- a/doomsday/apps/client/src/render/r_draw.cpp +++ b/doomsday/apps/client/src/render/r_draw.cpp @@ -80,14 +80,14 @@ static void loadViewBorderPatches() static ClientTexture &borderTexture(int borderComp) { res::TextureScheme &patches = res::Textures::get().textureScheme("Patches"); - DENG2_ASSERT(borderComp >= 0 && borderComp < 9); + DE_ASSERT(borderComp >= 0 && borderComp < 9); return static_cast(patches.findByUniqueId(borderPatches[borderComp]).texture()); } #undef R_SetBorderGfx -DENG_EXTERN_C void R_SetBorderGfx(struct uri_s const *const *paths) +DE_EXTERN_C void R_SetBorderGfx(struct uri_s const *const *paths) { - DENG2_ASSERT(initedDraw); + DE_ASSERT(initedDraw); if(!paths) return; for(uint i = 0; i < 9; ++i) @@ -211,11 +211,11 @@ static MaterialVariantSpec const &bgMaterialSpec() /// @todo Optimize: Do not search for resources (materials, textures) each frame. void R_DrawViewBorder() { - DENG2_ASSERT(initedDraw); + DE_ASSERT(initedDraw); viewport_t const *port = R_CurrentViewPort(); viewdata_t const *vd = &DD_Player(displayPlayer)->viewport(); - DENG2_ASSERT(port != 0 && vd != 0); + DE_ASSERT(port != 0 && vd != 0); if (!borderGraphicsNames[BG_BACKGROUND]) return; if (vd->window.isNull()) return; @@ -223,8 +223,8 @@ void R_DrawViewBorder() Vec2i const origin = port->geometry.topLeft; - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); DGL_Enable(DGL_TEXTURE_2D); diff --git a/doomsday/apps/client/src/render/r_main.cpp b/doomsday/apps/client/src/render/r_main.cpp index a8572432f8..bbb494fcc6 100644 --- a/doomsday/apps/client/src/render/r_main.cpp +++ b/doomsday/apps/client/src/render/r_main.cpp @@ -73,9 +73,9 @@ static void setupPSpriteParams(rendpspriteparams_t &parm, vispsprite_t const &vs dfloat const offScaleY = ::weaponOffsetScaleY / 1000.0f; - DENG2_ASSERT(vs.psp); + DE_ASSERT(vs.psp); ddpsprite_t const &psp = *vs.psp; - DENG2_ASSERT(psp.statePtr); + DE_ASSERT(psp.statePtr); state_t const &state = *psp.statePtr; defn::Sprite::View const spriteView = defn::Sprite(res::Sprites::get().sprite(state.sprite, state.frame)).view(0); @@ -114,7 +114,7 @@ static void setupPSpriteParams(rendpspriteparams_t &parm, vispsprite_t const &vs } else { - DENG2_ASSERT(vs.bspLeaf); + DE_ASSERT(vs.bspLeaf); #if 0 world::Map const &map = ClientApp::world().map(); if (useBias && map.hasLightGrid()) diff --git a/doomsday/apps/client/src/render/r_things.cpp b/doomsday/apps/client/src/render/r_things.cpp index fcfb234c53..b0c6672034 100644 --- a/doomsday/apps/client/src/render/r_things.cpp +++ b/doomsday/apps/client/src/render/r_things.cpp @@ -115,7 +115,7 @@ static void evaluateLighting(Vec3d const &origin, ConvexSubspace &subspaceAtOrig /// @todo use Mobj_OriginSmoothed static Vec3d mobjOriginSmoothed(mobj_t *mob) { - DENG2_ASSERT(mob); + DE_ASSERT(mob); coord_t origin[] = { mob->origin[0], mob->origin[1], mob->origin[2] }; // The client may have a Smoother for this object. @@ -458,7 +458,7 @@ void R_ProjectSprite(mobj_t &mob) } else { - DENG2_ASSERT(mf); + DE_ASSERT(mf); VisSprite_SetupModel(vis, VisEntityPose(vis->pose.origin, Vec3d(visOff.x, visOff.y, visOff.z - floorClip), @@ -495,7 +495,7 @@ void R_ProjectSprite(mobj_t &mob) } auto const *pl = (pointlight_analysis_t const *) tex->base().analysisDataPointer(res::Texture::BrightPointAnalysis); - DENG2_ASSERT(pl); + DE_ASSERT(pl); Lumobj const &lob = subsec.sector().map().lumobj(mob.lumIdx); vissprite_t *vis = R_NewVisSprite(VSPR_FLARE); diff --git a/doomsday/apps/client/src/render/rend_fakeradio.cpp b/doomsday/apps/client/src/render/rend_fakeradio.cpp index 2920016521..337005e91e 100644 --- a/doomsday/apps/client/src/render/rend_fakeradio.cpp +++ b/doomsday/apps/client/src/render/rend_fakeradio.cpp @@ -179,7 +179,7 @@ static bool wallReceivesShadow(WallEdge const &leftEdge, WallEdge const &rightEd if(shadowSize <= 0) return false; LineSide const &side = leftEdge.lineSide(); - DENG2_ASSERT(side.leftHEdge()); + DE_ASSERT(side.leftHEdge()); auto const &subsec = side.leftHEdge()->face().mapElementAs().subsector().as(); Plane const &visFloor = subsec.visFloor (); @@ -207,7 +207,7 @@ static bool wallReceivesShadow(WallEdge const &leftEdge, WallEdge const &rightEd && wallSideOpenness(leftEdge, rightEdge, true/*right side*/) > 0 && leftEdge.lineSideOffset() + wallWidth(leftEdge, rightEdge) > side.line().length() - shadowSize; } - DENG2_ASSERT_FAIL("Unknown WallShadow"); + DE_ASSERT_FAIL("Unknown WallShadow"); return false; } @@ -247,7 +247,7 @@ static void setTopShadowParams(WallEdge const &leftEdge, WallEdge const &rightEd ProjectedShadowData &projected) { LineSide /*const*/ &side = leftEdge.lineSide(); - DENG2_ASSERT(side.leftHEdge()); + DE_ASSERT(side.leftHEdge()); auto const &space = side.leftHEdge()->face().mapElementAs(); auto const &subsec = space.subsector().as(); Plane const &visFloor = subsec.visFloor (); @@ -405,7 +405,7 @@ static void setBottomShadowParams(WallEdge const &leftEdge, WallEdge const &righ ProjectedShadowData &projected) { LineSide /*const*/ &side = leftEdge.lineSide(); - DENG2_ASSERT(side.leftHEdge()); + DE_ASSERT(side.leftHEdge()); auto const &subsec = side.leftHEdge()->face().mapElementAs().subsector().as(); Plane const &visFloor = subsec.visFloor (); Plane const &visCeiling = subsec.visCeiling(); @@ -562,11 +562,11 @@ static void setSideShadowParams(WallEdge const &leftEdge, WallEdge const &rightE { LineSide /*const*/ &side = leftEdge.lineSide(); HEdge const *hedge = side.leftHEdge(); - DENG2_ASSERT(hedge); + DE_ASSERT(hedge); auto const &subsec = hedge->face().mapElementAs().subsector().as(); Plane const &visFloor = subsec.visFloor (); Plane const &visCeiling = subsec.visCeiling(); - DENG2_ASSERT(visFloor.castsShadow() || visCeiling.castsShadow()); // sanity check. + DE_ASSERT(visFloor.castsShadow() || visCeiling.castsShadow()); // sanity check. projected = {}; projected.texOrigin = Vec2f(0, leftEdge.bottom().z() - visFloor.heightSmoothed()); @@ -688,7 +688,7 @@ static void setSideShadowParams(WallEdge const &leftEdge, WallEdge const &rightE static void quadTexCoords(Vec2f *tc, WallEdge const &leftEdge, WallEdge const &rightEdge, Vec2f const &texOrigin, Vec2f const &texDimensions, bool horizontal) { - DENG2_ASSERT(tc); + DE_ASSERT(tc); if(horizontal) { tc[0] = (texOrigin / texDimensions).yx(); @@ -737,14 +737,14 @@ static bool projectWallShadow(WallEdge const &leftEdge, WallEdge const &rightEdg projected.texOrigin, projected.texDimensions, true/*horizontal*/); return true; } - DENG2_ASSERT_FAIL("Unknown WallShadow"); + DE_ASSERT_FAIL("Unknown WallShadow"); return false; } static void drawWallShadow(Vec3f const *posCoords, WallEdge const &leftEdge, WallEdge const &rightEdge, dfloat shadowDark, ProjectedShadowData const &tp) { - DENG2_ASSERT(posCoords); + DE_ASSERT(posCoords); // Uniform color - shadows are black. Vec4ub const shadowColor(0, 0, 0, 255 * de::clamp(0.f, shadowDark, 1.0f)); @@ -938,7 +938,7 @@ void Rend_DrawWallRadio(WallEdge const &leftEdge, WallEdge const &rightEdge, dfl static bool prepareFlatShadowEdges(ShadowEdge edges[2], HEdge const *hEdges[2], dint sectorPlaneIndex, dfloat shadowDark) { - DENG2_ASSERT(edges && hEdges && hEdges[0] && hEdges[1]); + DE_ASSERT(edges && hEdges && hEdges[0] && hEdges[1]); // If the sector containing the shadowing line section is fully closed (i.e., volume is // not positive) then skip shadow drawing entirely. @@ -988,7 +988,7 @@ static uint makeFlatShadowGeometry(DrawList::Indices &indices, Store &verts, gl: verts.posCoords[indices[order[2]]] = edges[1].inner(); verts.posCoords[indices[order[3]]] = edges[0].inner(); // Set uniform color. -#if defined (DENG_OPENGL) +#if defined (DE_OPENGL) Vec4ub const &uniformColor = (::renderWireframe? white : black); // White to assist visual debugging. #else Vec4ub const &uniformColor = black; @@ -1029,7 +1029,7 @@ void Rend_DrawFlatRadio(ConvexSubspace const &subspace) // All shadow geometry uses the same texture (i.e., none) - use the same list. DrawList &shadowList = ClientApp::renderSystem().drawLists().find( -#if defined (DENG_OPENGL) +#if defined (DE_OPENGL) DrawListSpec(renderWireframe? UnlitGeom : ShadowGeom) #else DrawListSpec(ShadowGeom) @@ -1039,7 +1039,7 @@ void Rend_DrawFlatRadio(ConvexSubspace const &subspace) // Process all LineSides linked to this subspace as potential shadow casters. subspace.forAllShadowLines([&subsec, &shadowDark, &eyeToSubspace, &shadowList] (LineSide &side) { - DENG2_ASSERT(side.hasSections() && !side.line().definesPolyobj() && side.leftHEdge()); + DE_ASSERT(side.hasSections() && !side.line().definesPolyobj() && side.leftHEdge()); // Process each only once per frame (we only want to draw a shadow set once). if(side.shadowVisCount() != R_FrameCount()) diff --git a/doomsday/apps/client/src/render/rend_font.cpp b/doomsday/apps/client/src/render/rend_font.cpp index 844e5d9754..0869b94c81 100644 --- a/doomsday/apps/client/src/render/rend_font.cpp +++ b/doomsday/apps/client/src/render/rend_font.cpp @@ -17,7 +17,7 @@ * http://www.gnu.org/licenses */ -#define DENG_NO_API_MACROS_FONT_RENDER +#define DE_NO_API_MACROS_FONT_RENDER #include "de_base.h" #include "render/rend_font.h" @@ -515,6 +515,10 @@ struct TextFragment } if (length > 0) +{ + DE_ASSERT(fragment != 0); + + if (fr.fontNum == 0) { width += currentAttribs()->tracking * (length - 1); } @@ -558,6 +562,9 @@ struct TextFragment static void drawTextFragment(const TextFragment &fragment) { + DE_ASSERT(fragment != 0 && fragment[0]); + + AbstractFont *font = &App_Resources().font(fr.fontNum); fr_state_attributes_t* sat = currentAttribs(); bool noTypein = (fragment.textFlags & DTF_NO_TYPEIN) != 0; @@ -1314,8 +1321,8 @@ void FR_DrawText3(const char* text, const Point2Raw* _origin, int alignFlags, ui FR_TextSize(&textSize, text); } - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); // We need to change the current color, so remember for restore. DGL_CurrentColor(origColor); @@ -1621,7 +1628,7 @@ void FR_Init(void) } #undef Fonts_ResolveUri -DENG_EXTERN_C fontid_t Fonts_ResolveUri(uri_s const *uri) +DE_EXTERN_C fontid_t Fonts_ResolveUri(uri_s const *uri) { if (!uri) return NOFONTID; try @@ -1633,7 +1640,7 @@ DENG_EXTERN_C fontid_t Fonts_ResolveUri(uri_s const *uri) return NOFONTID; } -DENG_DECLARE_API(FR) = +DE_DECLARE_API(FR) = { { DE_API_FONT_RENDER }, Fonts_ResolveUri, diff --git a/doomsday/apps/client/src/render/rend_halo.cpp b/doomsday/apps/client/src/render/rend_halo.cpp index 5459cce8ce..729904d86f 100644 --- a/doomsday/apps/client/src/render/rend_halo.cpp +++ b/doomsday/apps/client/src/render/rend_halo.cpp @@ -95,8 +95,8 @@ TextureVariantSpec const &Rend_HaloTextureSpec() void H_SetupState(bool dosetup) { - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); if(dosetup) { @@ -204,8 +204,8 @@ bool H_RenderHalo(Vec3d const &origin, float size, DGLuint tex, if(doPrimary) H_SetupState(true); - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); // Prepare the texture rotation matrix. DGL_MatrixMode(DGL_TEXTURE); @@ -360,7 +360,7 @@ bool H_RenderHalo(Vec3d const &origin, float size, DGLuint tex, */ D_CMD(FlareConfig) { - DENG2_UNUSED(src); + DE_UNUSED(src); int i; float val; diff --git a/doomsday/apps/client/src/render/rend_main.cpp b/doomsday/apps/client/src/render/rend_main.cpp index 98d26b4e50..7f36e471d5 100644 --- a/doomsday/apps/client/src/render/rend_main.cpp +++ b/doomsday/apps/client/src/render/rend_main.cpp @@ -168,7 +168,7 @@ dfloat fieldOfView = 95.0f; dbyte smoothTexAnim = true; dint renderTextures = true; -#if defined (DENG_OPENGL) +#if defined (DE_OPENGL) dint renderWireframe; #endif @@ -551,8 +551,8 @@ Mat4f Rend_GetModelViewMatrix(dint consoleNum, bool inWorldSpace) void Rend_ModelViewMatrix(bool inWorldSpace) { - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); DGL_MatrixMode(DGL_MODELVIEW); DGL_LoadMatrix( @@ -857,7 +857,7 @@ void Rend_AddMaskedPoly(Vec3f const *rvertices, Vec4f const *rcolors, static void quadTexCoords(Vec2f *tc, Vec3f const *rverts, coord_t wallLength, Vec3d const &topLeft) { - DENG2_ASSERT(tc && rverts); + DE_ASSERT(tc && rverts); tc[0].x = tc[1].x = rverts[0].x - topLeft.x; tc[3].y = tc[1].y = rverts[0].y - topLeft.y; tc[3].x = tc[2].x = tc[0].x + wallLength; @@ -992,7 +992,7 @@ static void lightWallOrFlatGeometry(Geometry &verts, duint numVertices, Vec3f co } // Apply torch light? - DENG2_ASSERT(::viewPlayer); + DE_ASSERT(::viewPlayer); if (::viewPlayer->publicData().fixedColorMap) { for (duint i = 0; i < numVertices; ++i) @@ -1007,7 +1007,7 @@ static void makeFlatGeometry(Geometry &verts, duint numVertices, Vec3f const *po Mat3f const &surfaceTangents, dfloat uniformOpacity, Vec3f const &color, Vec3f const *color2, dfloat glowing, dfloat const luminosityDeltas[2], bool useVertexLighting = true) { - DENG2_ASSERT(posCoords); + DE_ASSERT(posCoords); for (duint i = 0; i < numVertices; ++i) { @@ -1044,7 +1044,7 @@ static void makeWallGeometry(Geometry &verts, duint numVertices, Vec3f const *po Vec3f const &color, Vec3f const *color2, dfloat glowing, dfloat const luminosityDeltas[2], bool useVertexLighting = true) { - DENG2_ASSERT(posCoords); + DE_ASSERT(posCoords); for (duint i = 0; i < numVertices; ++i) { @@ -1081,7 +1081,7 @@ static inline dfloat shineVertical(dfloat dy, dfloat dx) static void makeFlatShineGeometry(Geometry &verts, duint numVertices, Vec3f const *posCoords, Geometry const &mainVerts, Vec3f const &shineColor, dfloat shineOpacity) { - DENG2_ASSERT(posCoords); + DE_ASSERT(posCoords); for (duint i = 0; i < numVertices; ++i) { @@ -1109,7 +1109,7 @@ static void makeFlatShineGeometry(Geometry &verts, duint numVertices, Vec3f cons static void makeWallShineGeometry(Geometry &verts, duint numVertices, Vec3f const *posCoords, Geometry const &mainVerts, coord_t sectionWidth, Vec3f const &shineColor, dfloat shineOpactiy) { - DENG2_ASSERT(posCoords); + DE_ASSERT(posCoords); Vec3f const &topLeft = posCoords[1]; Vec3f const &bottomRight = posCoords[2]; @@ -1169,7 +1169,7 @@ static void makeFlatShadowGeometry(Geometry &verts, Vec3d const &topLeft, Vec3d duint numVertices, Vec3f const *posCoords, ProjectedTextureData const &tp) { - DENG2_ASSERT(posCoords); + DE_ASSERT(posCoords); Vec4f const colorClamped = tp.color.min(Vec4f(1, 1, 1, 1)).max(Vec4f(0, 0, 0, 0)); for (duint i = 0; i < numVertices; ++i) @@ -1196,7 +1196,7 @@ static void makeWallShadowGeometry(Geometry &verts, Vec3d const &/*topLeft*/, Ve duint numVertices, Vec3f const *posCoords, WallEdge const &leftEdge, WallEdge const &rightEdge, ProjectedTextureData const &tp) { - DENG2_ASSERT(posCoords); + DE_ASSERT(posCoords); Vec4f const colorClamped = tp.color.min(Vec4f(1, 1, 1, 1)).max(Vec4f(0, 0, 0, 0)); for (duint i = 0; i < numVertices; ++i) @@ -1233,7 +1233,7 @@ static void makeFlatLightGeometry(Geometry &verts, Vec3d const &topLeft, Vec3d c duint numVertices, Vec3f const *posCoords, ProjectedTextureData const &tp) { - DENG2_ASSERT(posCoords); + DE_ASSERT(posCoords); Vec4f const colorClamped = tp.color.min(Vec4f(1, 1, 1, 1)).max(Vec4f(0, 0, 0, 0)); for (duint i = 0; i < numVertices; ++i) @@ -1259,7 +1259,7 @@ static void makeWallLightGeometry(Geometry &verts, Vec3d const &/*topLeft*/, Vec duint numVertices, Vec3f const *posCoords, WallEdge const &leftEdge, WallEdge const &rightEdge, ProjectedTextureData const &tp) { - DENG2_ASSERT(posCoords); + DE_ASSERT(posCoords); Vec4f const colorClamped = tp.color.min(Vec4f(1, 1, 1, 1)).max(Vec4f(0, 0, 0, 0)); for (duint i = 0; i < numVertices; ++i) @@ -1294,7 +1294,7 @@ static void makeWallLightGeometry(Geometry &verts, Vec3d const &/*topLeft*/, Vec static dfloat averageLuminosity(Vec4f const *rgbaValues, duint count) { - DENG2_ASSERT(rgbaValues); + DE_ASSERT(rgbaValues); dfloat avg = 0; for (duint i = 0; i < count; ++i) { @@ -1339,7 +1339,7 @@ static bool renderWorldPoly(Vec3f const *rvertices, duint numVertices, { using Parm = DrawList::PrimitiveParams; - DENG2_ASSERT(rvertices); + DE_ASSERT(rvertices); static DrawList::Indices indices; @@ -1389,7 +1389,7 @@ static bool renderWorldPoly(Vec3f const *rvertices, duint numVertices, if (drawAsVisSprite) { - DENG2_ASSERT(p.isWall); + DE_ASSERT(p.isWall); // This is needed because all masked polys must be sorted (sprites are masked polys). // Otherwise there will be artifacts. @@ -1501,7 +1501,7 @@ static bool renderWorldPoly(Vec3f const *rvertices, duint numVertices, // Walls with edge divisions mean two trifans. if (mustSubdivide) { - DENG2_ASSERT(p.isWall); + DE_ASSERT(p.isWall); duint const numLeftVerts = 3 + p.wall.leftEdge ->divisionCount(); duint const numRightVerts = 3 + p.wall.rightEdge->divisionCount(); @@ -1595,7 +1595,7 @@ static bool renderWorldPoly(Vec3f const *rvertices, duint numVertices, // Walls with edge divisions mean two trifans. if (mustSubdivide) { - DENG2_ASSERT(p.isWall); + DE_ASSERT(p.isWall); duint const numLeftVerts = 3 + p.wall.leftEdge ->divisionCount(); duint const numRightVerts = 3 + p.wall.rightEdge->divisionCount(); @@ -1653,7 +1653,7 @@ static bool renderWorldPoly(Vec3f const *rvertices, duint numVertices, // Walls with edge divisions mean two trifans. if (mustSubdivide) { - DENG2_ASSERT(p.isWall); + DE_ASSERT(p.isWall); duint const numLeftVerts = 3 + p.wall.leftEdge ->divisionCount(); duint const numRightVerts = 3 + p.wall.rightEdge->divisionCount(); @@ -1797,7 +1797,7 @@ static bool renderWorldPoly(Vec3f const *rvertices, duint numVertices, } if ((primFlags & (Parm::OneLight | Parm::ManyLights)) && Rend_IsMTexLights()) { - DENG2_ASSERT(modTexCoords); + DE_ASSERT(modTexCoords); buffer.modCoords[indices[i]] = modTexCoords[numLeftVerts + i]; } } @@ -1836,7 +1836,7 @@ static bool renderWorldPoly(Vec3f const *rvertices, duint numVertices, } if ((primFlags & (Parm::OneLight | Parm::ManyLights)) && Rend_IsMTexLights()) { - DENG2_ASSERT(modTexCoords); + DE_ASSERT(modTexCoords); buffer.modCoords[indices[i]] = modTexCoords[i]; } } @@ -1952,7 +1952,7 @@ static bool renderWorldPoly(Vec3f const *rvertices, duint numVertices, } if ((primFlags & (Parm::OneLight | Parm::ManyLights)) && Rend_IsMTexLights()) { - DENG2_ASSERT(modTexCoords); + DE_ASSERT(modTexCoords); buffer.modCoords[indices[i]] = modTexCoords[i]; } } @@ -2025,7 +2025,7 @@ static bool renderWorldPoly(Vec3f const *rvertices, duint numVertices, // Walls with edge divisions mean two trifans. if (mustSubdivide) { - DENG2_ASSERT(p.isWall); + DE_ASSERT(p.isWall); duint const numLeftVerts = 3 + p.wall.leftEdge ->divisionCount(); duint const numRightVerts = 3 + p.wall.rightEdge->divisionCount(); @@ -2326,7 +2326,7 @@ static void projectDynamics(Surface const &surface, dfloat glowStrength, bool noLights, bool noShadows, bool sortLights, duint &lightListIdx, duint &shadowListIdx) { - DENG2_ASSERT(curSubspace); + DE_ASSERT(curSubspace); if (levelFullBright) return; if (glowStrength >= 1) return; @@ -2640,7 +2640,7 @@ static void wallLuminosityDeltas(WallEdge const &leftEdge, WallEdge const &right static void writeWall(WallEdge const &leftEdge, WallEdge const &rightEdge, bool *retWroteOpaque = nullptr, coord_t *retBottomZ = nullptr, coord_t *retTopZ = nullptr) { - DENG2_ASSERT(leftEdge.lineSideSegment().isFrontFacing() && leftEdge.lineSide().hasSections()); + DE_ASSERT(leftEdge.lineSideSegment().isFrontFacing() && leftEdge.lineSide().hasSections()); if (retWroteOpaque) *retWroteOpaque = false; if (retBottomZ) *retBottomZ = 0; @@ -2788,7 +2788,7 @@ static void writeWall(WallEdge const &leftEdge, WallEdge const &rightEdge, static duint buildSubspacePlaneGeometry(ClockDirection direction, coord_t height, Vec3f **verts) { - DENG2_ASSERT(verts); + DE_ASSERT(verts); Face const &poly = curSubspace->poly(); HEdge *fanBase = curSubspace->fanBase(); @@ -2960,7 +2960,7 @@ static void writeSubspacePlane(Plane &plane) static void writeSkyMaskStrip(dint vertCount, Vec3f const *posCoords, Vec2f const *texCoords, Material *material) { - DENG2_ASSERT(posCoords); + DE_ASSERT(posCoords); static DrawList::Indices indices; @@ -2979,13 +2979,13 @@ static void writeSkyMaskStrip(dint vertCount, Vec3f const *posCoords, Vec2f cons } else { - DENG2_ASSERT(texCoords); + DE_ASSERT(texCoords); DrawListSpec listSpec; listSpec.group = UnlitGeom; if (renderTextures != 2) { - DENG2_ASSERT(material); + DE_ASSERT(material); MaterialAnimator &matAnimator = material->as().getAnimator(Rend_MapSurfaceMaterialSpec()); // Ensure we've up to date info about the material. @@ -3197,7 +3197,7 @@ static uint makeFlatSkyMaskGeometry(DrawList::Indices &indices, Store &verts, gl /// @param skyCap @ref skyCapFlags static void writeSubspaceSkyMask(dint skyCap = SKYCAP_LOWER | SKYCAP_UPPER) { - DENG2_ASSERT(::curSubspace); + DE_ASSERT(::curSubspace); // No work to do? if (!skyCap) return; @@ -3385,9 +3385,9 @@ static void writeAllWalls(HEdge &hedge) static void writeSubspaceWalls() { - DENG2_ASSERT(::curSubspace); + DE_ASSERT(::curSubspace); HEdge *base = ::curSubspace->poly().hedge(); - DENG2_ASSERT(base); + DE_ASSERT(base); HEdge *hedge = base; do { @@ -3415,7 +3415,7 @@ static void writeSubspaceWalls() static void writeSubspaceFlats() { - DENG2_ASSERT(::curSubspace); + DE_ASSERT(::curSubspace); auto &subsec = ::curSubspace->subsector().as(); for (dint i = 0; i < subsec.visPlaneCount(); ++i) { @@ -3439,10 +3439,10 @@ static void markFrontFacingWalls(HEdge &hedge) static void markSubspaceFrontFacingWalls() { - DENG2_ASSERT(::curSubspace); + DE_ASSERT(::curSubspace); HEdge *base = ::curSubspace->poly().hedge(); - DENG2_ASSERT(base); + DE_ASSERT(base); HEdge *hedge = base; do { @@ -3487,7 +3487,7 @@ static void occludeSubspace(bool frontFacing) auto const &subsec = ::curSubspace->subsector().as(); HEdge const *base = ::curSubspace->poly().hedge(); - DENG2_ASSERT(base); + DE_ASSERT(base); HEdge const *hedge = base; do { @@ -3558,7 +3558,7 @@ static void occludeSubspace(bool frontFacing) static void clipSubspaceLumobjs() { - DENG2_ASSERT(::curSubspace); + DE_ASSERT(::curSubspace); ::curSubspace->forAllLumobjs([] (Lumobj &lob) { R_ViewerClipLumobj(&lob); @@ -3573,7 +3573,7 @@ static void clipSubspaceLumobjs() */ static void clipSubspaceLumobjsBySight() { - DENG2_ASSERT(::curSubspace); + DE_ASSERT(::curSubspace); // Any work to do? if (!::curSubspace->polyobjCount()) @@ -3604,10 +3604,10 @@ static void clipFrontFacingWalls(HEdge &hedge) static void clipSubspaceFrontFacingWalls() { - DENG2_ASSERT(::curSubspace); + DE_ASSERT(::curSubspace); HEdge *base = ::curSubspace->poly().hedge(); - DENG2_ASSERT(base); + DE_ASSERT(base); HEdge *hedge = base; do { @@ -3635,7 +3635,7 @@ static void clipSubspaceFrontFacingWalls() static void projectSubspaceSprites() { - DENG2_ASSERT(::curSubspace); + DE_ASSERT(::curSubspace); // Do not use validCount because other parts of the renderer may change it. if (::curSubspace->lastSpriteProjectFrame() == R_FrameCount()) @@ -3692,7 +3692,7 @@ static void projectSubspaceSprites() */ static void drawCurrentSubspace() { - DENG2_ASSERT(curSubspace); + DE_ASSERT(curSubspace); Sector §or = ::curSubspace->sector(); @@ -3765,7 +3765,7 @@ static void makeCurrent(ConvexSubspace &subspace) static void traverseBspTreeAndDrawSubspaces(BspTree const *bspTree) { - DENG2_ASSERT(bspTree); + DE_ASSERT(bspTree); AngleClipper const &clipper = ClientApp::renderSystem().angleClipper(); while (!bspTree->isLeaf()) @@ -3792,7 +3792,7 @@ static void traverseBspTreeAndDrawSubspaces(BspTree const *bspTree) // Only leafs with a convex subspace geometry contain surfaces to draw. if (ConvexSubspace *subspace = bspTree->userData()->as().subspacePtr()) { - DENG2_ASSERT(subspace->hasSubsector()); + DE_ASSERT(subspace->hasSubsector()); // Skip zero-volume subspaces. // (Neighbors handle the angle clipper ranges.) @@ -4404,7 +4404,7 @@ static void drawSky() static bool generateHaloForVisSprite(vissprite_t const *spr, bool primary = false) { - DENG2_ASSERT(spr); + DE_ASSERT(spr); if (primary && (spr->data.flare.flags & RFF_NO_PRIMARY)) { @@ -4516,9 +4516,9 @@ static void drawMasked() */ static void drawAllLists(Map &map) { - DENG2_ASSERT(!Sys_GLCheckError()); - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT(!Sys_GLCheckError()); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); drawSky(); @@ -4714,7 +4714,7 @@ static void drawAllLists(Map &map) DGL_Disable(DGL_FOG); } - DENG2_ASSERT(!Sys_GLCheckError()); + DE_ASSERT(!Sys_GLCheckError()); } void Rend_RenderMap(Map &map) @@ -4835,7 +4835,7 @@ static void drawLabel(String const &label, Vec3d const &origin, ddouble maxDista ddouble const distToEye = (Rend_EyeOrigin().xzy() - origin).length(); if (distToEye < maxDistance) { - drawLabel(label, origin, distToEye / (DENG_GAMEVIEW_WIDTH / 2), 1 - distToEye / maxDistance); + drawLabel(label, origin, distToEye / (DE_GAMEVIEW_WIDTH / 2), 1 - distToEye / maxDistance); } } @@ -4911,7 +4911,7 @@ static void drawBiasEditingVisuals(Map &map) grabbedColor = Vec4f(.7f, .7f, .5f, .4f); BiasSource *nearSource = map.biasSourceNear(hand.origin()); - DENG2_ASSERT(nearSource); + DE_ASSERT(nearSource); if ((hand.origin() - nearSource->origin()).length() > 2 * handDistance) { @@ -5054,7 +5054,7 @@ void Rend_UpdateLightModMatrix() lightModRange[i] = lightlevel / 255.0f; // Ensure the resultant value never exceeds the expected [0..1] range. - DENG2_ASSERT(INRANGE_OF(i / 255.0f + lightModRange[i], 0.f, 1.f)); + DE_ASSERT(INRANGE_OF(i / 255.0f + lightModRange[i], 0.f, 1.f)); } } @@ -5081,7 +5081,7 @@ void Rend_DrawLightModMatrix() DGL_MatrixMode(DGL_PROJECTION); DGL_PushMatrix(); DGL_LoadIdentity(); - DGL_Ortho(0, 0, DENG_GAMEVIEW_WIDTH, DENG_GAMEVIEW_HEIGHT, -1, 1); + DGL_Ortho(0, 0, DE_GAMEVIEW_WIDTH, DE_GAMEVIEW_HEIGHT, -1, 1); DGL_Translatef(BORDER, BORDER, 0); @@ -5266,7 +5266,7 @@ static void drawMobjBBox(mobj_t &mob) return; ddouble const distToEye = (eyeOrigin - Mobj_Origin(mob)).length(); - dfloat alpha = 1 - ((distToEye / (DENG_GAMEVIEW_WIDTH/2)) / 4); + dfloat alpha = 1 - ((distToEye / (DE_GAMEVIEW_WIDTH/2)) / 4); if (alpha < .25f) alpha = .25f; // Don't make them totally invisible. @@ -5343,7 +5343,7 @@ static void drawMobjBoundingBoxes(Map &map) sec.floor().height()); ddouble const distToEye = (eyeOrigin - pos).length(); - dfloat alpha = 1 - ((distToEye / (DENG_GAMEVIEW_WIDTH/2)) / 4); + dfloat alpha = 1 - ((distToEye / (DE_GAMEVIEW_WIDTH/2)) / 4); if (alpha < .25f) alpha = .25f; // Don't make them totally invisible. @@ -5727,7 +5727,7 @@ static void drawGenerator(Generator const &gen) ddouble const distToEye = (eyeOrigin - origin).length(); if (distToEye < MAX_GENERATOR_DIST) { - drawLabel(labelForGenerator(gen), origin, distToEye / (DENG_GAMEVIEW_WIDTH / 2) + drawLabel(labelForGenerator(gen), origin, distToEye / (DE_GAMEVIEW_WIDTH / 2) , 1 - distToEye / MAX_GENERATOR_DIST); } } @@ -5778,7 +5778,7 @@ static void drawBar(Vec3d const &origin, coord_t height, dfloat opacity) static String labelForVertex(Vertex const *vtx) { - DENG2_ASSERT(vtx); + DE_ASSERT(vtx); return String("%1").arg(vtx->indexInMap()); } @@ -5830,7 +5830,7 @@ static void drawVertexVisual(Vertex const &vertex, ddouble minHeight, ddouble ma DGL_Disable(DGL_DEPTH_TEST); DGL_Enable(DGL_TEXTURE_2D); - drawLabel(labelForVertex(&vertex), origin, distToEye / (DENG_GAMEVIEW_WIDTH / 2), opacity); + drawLabel(labelForVertex(&vertex), origin, distToEye / (DE_GAMEVIEW_WIDTH / 2), opacity); DGL_Enable(DGL_DEPTH_TEST); DGL_Disable(DGL_TEXTURE_2D); @@ -5955,7 +5955,7 @@ static void drawVertexes(Map &map) { DGL_Disable(DGL_DEPTH_TEST); -#if defined (DENG_OPENGL) +#if defined (DE_OPENGL) LIBGUI_GL.glEnable(GL_LINE_SMOOTH); #endif oldLineWidth = DGL_GetFloat(DGL_LINE_WIDTH); @@ -5985,7 +5985,7 @@ static void drawVertexes(Map &map) // Draw the vertex origins. dfloat const oldPointSize = DGL_GetFloat(DGL_POINT_SIZE); -#if defined (DENG_OPENGL) +#if defined (DE_OPENGL) LIBGUI_GL.glEnable(GL_POINT_SMOOTH); #endif DGL_SetFloat(DGL_POINT_SIZE, 6); @@ -6039,12 +6039,12 @@ static void drawVertexes(Map &map) if (devVertexBars) { DGL_SetFloat(DGL_LINE_WIDTH, oldLineWidth); -#if defined (DENG_OPENGL) +#if defined (DE_OPENGL) LIBGUI_GL.glDisable(GL_LINE_SMOOTH); #endif } DGL_SetFloat(DGL_POINT_SIZE, oldPointSize); -#if defined (DENG_OPENGL) +#if defined (DE_OPENGL) LIBGUI_GL.glDisable(GL_POINT_SMOOTH); #endif @@ -6082,7 +6082,7 @@ static void drawSectors(Map &map) ddouble const distToEye = (eyeOrigin - origin).length(); if (distToEye < MAX_LABEL_DIST) { - drawLabel(labelForSubsector(subsec), origin, distToEye / (DENG_GAMEVIEW_WIDTH / 2) + drawLabel(labelForSubsector(subsec), origin, distToEye / (DE_GAMEVIEW_WIDTH / 2) , 1 - distToEye / MAX_LABEL_DIST); } return LoopContinue; @@ -6095,7 +6095,7 @@ static void drawSectors(Map &map) static String labelForThinker(thinker_t *thinker) { - DENG2_ASSERT(thinker); + DE_ASSERT(thinker); return String("%1").arg(thinker->id); } @@ -6125,7 +6125,7 @@ static void drawThinkers(Map &map) ddouble const distToEye = (eyeOrigin - origin).length(); if (distToEye < MAX_THINKER_DIST) { - drawLabel(labelForThinker(th), origin, distToEye / (DENG_GAMEVIEW_WIDTH / 2) + drawLabel(labelForThinker(th), origin, distToEye / (DE_GAMEVIEW_WIDTH / 2) , 1 - distToEye / MAX_THINKER_DIST); } } @@ -6145,8 +6145,8 @@ void Rend_LightGridVisual(LightGrid &lg) // Disabled? if (!devLightGrid) return; - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); // Determine the grid reference of the view player. LightGrid::Index viewerGridIndex = 0; @@ -6160,7 +6160,7 @@ void Rend_LightGridVisual(LightGrid &lg) DGL_MatrixMode(DGL_PROJECTION); DGL_PushMatrix(); DGL_LoadIdentity(); - DGL_Ortho(0, 0, DENG_GAMEVIEW_WIDTH, DENG_GAMEVIEW_HEIGHT, -1, 1); + DGL_Ortho(0, 0, DE_GAMEVIEW_WIDTH, DE_GAMEVIEW_HEIGHT, -1, 1); for (dint y = 0; y < lg.dimensions().y; ++y) { @@ -6234,7 +6234,7 @@ TextureVariantSpec const &Rend_MapSurfaceShinyMaskTextureSpec() D_CMD(OpenRendererAppearanceEditor) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); if (!App_GameLoaded()) { @@ -6254,7 +6254,7 @@ D_CMD(OpenRendererAppearanceEditor) D_CMD(OpenModelAssetEditor) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); if (!App_GameLoaded()) { @@ -6272,7 +6272,7 @@ D_CMD(OpenModelAssetEditor) D_CMD(LowRes) { - DENG2_UNUSED3(src, argv, argc); + DE_UNUSED(src, argv, argc); // Set everything as low as they go. filterSprites = 0; @@ -6289,7 +6289,7 @@ D_CMD(LowRes) D_CMD(MipMap) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); dint newMipMode = String(argv[1]).toInt(); if (newMipMode < 0 || newMipMode > 5) @@ -6305,7 +6305,7 @@ D_CMD(MipMap) D_CMD(TexReset) { - DENG2_UNUSED(src); + DE_UNUSED(src); if (argc == 2 && !String(argv[1]).compareWithoutCase("raw")) { diff --git a/doomsday/apps/client/src/render/rend_model.cpp b/doomsday/apps/client/src/render/rend_model.cpp index 59c4200768..e687311b9e 100644 --- a/doomsday/apps/client/src/render/rend_model.cpp +++ b/doomsday/apps/client/src/render/rend_model.cpp @@ -107,7 +107,7 @@ static FrameModelLOD *activeLod; static uint vertexBufferMax; ///< Maximum number of vertices we'll be required to render per submodel. static uint vertexBufferSize; ///< Current number of vertices supported by the render buffer. -#ifdef DENG_DEBUG +#ifdef DE_DEBUG static bool announcedVertexBufferMaxBreach; ///< @c true if an attempt has been made to expand beyond our capability. #endif @@ -141,7 +141,7 @@ void Rend_ModelInit() modelTexCoords = 0; vertexBufferMax = vertexBufferSize = 0; -#ifdef DENG_DEBUG +#ifdef DE_DEBUG announcedVertexBufferMaxBreach = false; #endif @@ -158,7 +158,7 @@ void Rend_ModelShutdown() M_Free(modelTexCoords); modelTexCoords = 0; vertexBufferMax = vertexBufferSize = 0; -#ifdef DENG_DEBUG +#ifdef DE_DEBUG announcedVertexBufferMaxBreach = false; #endif @@ -167,7 +167,7 @@ void Rend_ModelShutdown() bool Rend_ModelExpandVertexBuffers(uint numVertices) { - DENG2_ASSERT(inited); + DE_ASSERT(inited); LOG_AS("Rend_ModelExpandVertexBuffers"); @@ -176,7 +176,7 @@ bool Rend_ModelExpandVertexBuffers(uint numVertices) // Sanity check a sane maximum... if (numVertices >= RENDER_MAX_MODEL_VERTS) { -#ifdef DENG_DEBUG +#ifdef DE_DEBUG if (!announcedVertexBufferMaxBreach) { LOGDEV_GL_WARNING("Attempted to expand to %u vertices (max %u)") @@ -216,8 +216,8 @@ static bool resizeVertexBuffer(uint numVertices) static void disableArrays(int vertices, int colors, int coords) { - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); if (vertices) { @@ -237,21 +237,21 @@ static void disableArrays(int vertices, int colors, int coords) } } - DENG_ASSERT(!Sys_GLCheckError()); + DE_ASSERT(!Sys_GLCheckError()); } static inline void enableTexUnit(int id) { - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); DGL_Enable(DGL_TEXTURE0 + id); } static inline void disableTexUnit(int id) { - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); DGL_Disable(DGL_TEXTURE0 + id); @@ -286,8 +286,8 @@ static void selectTexUnits(int count) static void configureArrays(void *vertices, void *colors, int numCoords = 0, void **coords = 0) { - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); if (vertices) { @@ -310,13 +310,13 @@ static void configureArrays(void *vertices, void *colors, int numCoords = 0, } } - DENG_ASSERT(!Sys_GLCheckError()); + DE_ASSERT(!Sys_GLCheckError()); } static void drawArrayElement(int index) { - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); for (int i = 0; i < MAX_TEX_UNITS; ++i) { @@ -371,8 +371,8 @@ static void drawPrimitives(rendcmd_t mode, Vec4ub *colorCoords, Vec2f *texCoords = 0) { - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); // Disable all vertex arrays. disableArrays(true, true, DDMAXINT); @@ -471,9 +471,9 @@ static void drawPrimitives(rendcmd_t mode, static void Mod_LerpVertices(float inter, int count, FrameModelFrame const &from, FrameModelFrame const &to, Vec3f *posOut, Vec3f *normOut) { - DENG2_ASSERT(&from.model == &to.model); // sanity check. - DENG2_ASSERT(!activeLod || &activeLod->model == &from.model); // sanity check. - DENG2_ASSERT(from.vertices.count() == to.vertices.count()); // sanity check. + DE_ASSERT(&from.model == &to.model); // sanity check. + DE_ASSERT(!activeLod || &activeLod->model == &from.model); // sanity check. + DE_ASSERT(from.vertices.count() == to.vertices.count()); // sanity check. FrameModelFrame::VertexBuf::const_iterator startIt = from.vertices.begin(); FrameModelFrame::VertexBuf::const_iterator endIt = to.vertices.begin(); @@ -504,7 +504,7 @@ static void Mod_LerpVertices(float inter, int count, FrameModelFrame const &from static void Mod_MirrorCoords(dint count, Vec3f *coords, dint axis) { - DENG2_ASSERT(coords); + DE_ASSERT(coords); for (; count-- > 0; coords++) { (*coords)[axis] = -(*coords)[axis]; @@ -592,7 +592,7 @@ static void Mod_VertexColors(Vec4ub *out, dint count, Vec3f const *normCoords, */ static void Mod_FullBrightVertexColors(dint count, Vec4ub *colorCoords, dfloat alpha) { - DENG2_ASSERT(colorCoords); + DE_ASSERT(colorCoords); for (; count-- > 0; colorCoords++) { *colorCoords = Vec4ub(255, 255, 255, 255 * alpha); @@ -604,7 +604,7 @@ static void Mod_FullBrightVertexColors(dint count, Vec4ub *colorCoords, dfloat a */ static void Mod_FixedVertexColors(dint count, Vec4ub *colorCoords, Vec4ub const &color) { - DENG2_ASSERT(colorCoords); + DE_ASSERT(colorCoords); for (; count-- > 0; colorCoords++) { *colorCoords = color; @@ -837,7 +837,7 @@ static void drawSubmodel(uint number, vissprite_t const &spr) // Determine the suitable LOD. if (mdl.lodCount() > 1 && rend_model_lod != 0) { - float lodFactor = rend_model_lod * DENG_GAMEVIEW_WIDTH / 640.0f / (Rend_FieldOfView() / 90.0f); + float lodFactor = rend_model_lod * DE_GAMEVIEW_WIDTH / 640.0f / (Rend_FieldOfView() / 90.0f); if (!de::fequal(lodFactor, 0)) { lodFactor = 1 / lodFactor; @@ -1101,9 +1101,9 @@ void Rend_DrawModel(vissprite_t const &spr) { drawmodelparams_t const &parm = *VS_MODEL(&spr); - DENG2_ASSERT(inited); - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT(inited); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); if (!parm.mf) return; diff --git a/doomsday/apps/client/src/render/rend_particle.cpp b/doomsday/apps/client/src/render/rend_particle.cpp index 0455270925..d7a45ebc0c 100644 --- a/doomsday/apps/client/src/render/rend_particle.cpp +++ b/doomsday/apps/client/src/render/rend_particle.cpp @@ -127,7 +127,7 @@ static Path tryFindImage(String name) // Try to load the texture. static dbyte loadParticleTexture(duint particleTex) { - DENG2_ASSERT(particleTex < MAX_PTC_TEXTURES); + DE_ASSERT(particleTex < MAX_PTC_TEXTURES); image_t image; @@ -203,7 +203,7 @@ void Rend_ParticleLoadSystemTextures() ( TXCF_MIPMAP | TXCF_NO_COMPRESSION ), 0, glmode[mipmapping], GL_LINEAR, 0 /*no anisotropy*/, GL_CLAMP_TO_EDGE, GL_CLAMP_TO_EDGE); - DENG2_ASSERT(pointTex != 0); + DE_ASSERT(pointTex != 0); } Image_ClearPixelData(image); } @@ -520,8 +520,8 @@ static Vec2f lineUnitVector(Line const &line) static void drawParticles(dint rtype, bool withBlend) { - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); viewdata_t const *viewData = &viewPlayer->viewport(); Vec3f const leftoff = viewData->upVec + viewData->sideVec; @@ -738,7 +738,7 @@ static void drawParticles(dint rtype, bool withBlend) // Flat against a wall, then? else if(flatOnWall) { - DENG2_ASSERT(pinfo.contact); + DE_ASSERT(pinfo.contact); Line const &contact = *pinfo.contact; // There will be a slight approximation on the XY plane since @@ -836,7 +836,7 @@ static void drawParticles(dint rtype, bool withBlend) static void renderPass(bool useBlending) { - DENG2_ASSERT(!Sys_GLCheckError()); + DE_ASSERT(!Sys_GLCheckError()); // Set blending mode. if(useBlending) @@ -873,7 +873,7 @@ static void renderPass(bool useBlending) GL_BlendMode(BM_NORMAL); } - DENG2_ASSERT(!Sys_GLCheckError()); + DE_ASSERT(!Sys_GLCheckError()); } void Rend_RenderParticles(world::Map &map) diff --git a/doomsday/apps/client/src/render/rendersystem.cpp b/doomsday/apps/client/src/render/rendersystem.cpp index 29dd2b7151..c70e50e758 100644 --- a/doomsday/apps/client/src/render/rendersystem.cpp +++ b/doomsday/apps/client/src/render/rendersystem.cpp @@ -50,9 +50,9 @@ using namespace de; -DENG2_PIMPL(RenderSystem) -, DENG2_OBSERVES(PackageLoader, Load) -, DENG2_OBSERVES(PackageLoader, Unload) +DE_PIMPL(RenderSystem) +, DE_OBSERVES(PackageLoader, Load) +, DE_OBSERVES(PackageLoader, Unload) { Binder binder; Record renderModule; @@ -120,7 +120,7 @@ DENG2_PIMPL(RenderSystem) ProjectionList &findOrCreateList(duint *listIdx, bool sortByLuma) { - DENG2_ASSERT(listIdx); + DE_ASSERT(listIdx); // Do we need to allocate a list? if(!(*listIdx)) @@ -192,7 +192,7 @@ DENG2_PIMPL(RenderSystem) VectorLightList &findOrCreateList(duint *listIdx) { - DENG2_ASSERT(listIdx); + DE_ASSERT(listIdx); // Do we need to allocate a list? if(!(*listIdx)) @@ -349,7 +349,7 @@ DENG2_PIMPL(RenderSystem) { FS::FoundFiles found; App::packageLoader().package(packageId).findPartialPath("shaders.dei", found); - DENG2_FOR_EACH(FS::FoundFiles, i, found) + DE_FOR_EACH(FS::FoundFiles, i, found) { // Load new shaders. loadShaders(**i); @@ -373,7 +373,7 @@ DENG2_PIMPL(RenderSystem) // // Load all the shader program definitions. // FS::FoundFiles found; // App::findInPackages("shaders.dei", found); -// DENG2_FOR_EACH(FS::FoundFiles, i, found) +// DE_FOR_EACH(FS::FoundFiles, i, found) // { // loadShaders(**i); // } diff --git a/doomsday/apps/client/src/render/shadowedge.cpp b/doomsday/apps/client/src/render/shadowedge.cpp index 26d77fcb26..42308ceb69 100644 --- a/doomsday/apps/client/src/render/shadowedge.cpp +++ b/doomsday/apps/client/src/render/shadowedge.cpp @@ -38,7 +38,7 @@ using namespace world; namespace de { -DENG2_PIMPL_NOREF(ShadowEdge) +DE_PIMPL_NOREF(ShadowEdge) { HEdge const *leftMostHEdge = nullptr; dint edge = 0; diff --git a/doomsday/apps/client/src/render/skydrawable.cpp b/doomsday/apps/client/src/render/skydrawable.cpp index ab9ba06c94..7b00c4b910 100644 --- a/doomsday/apps/client/src/render/skydrawable.cpp +++ b/doomsday/apps/client/src/render/skydrawable.cpp @@ -187,7 +187,7 @@ struct Hemisphere void draw(SphereComponent hemisphere, Sky const &sky, dint firstActiveLayer, LayerData const *layerData) const { - DENG2_ASSERT(layerData); + DE_ASSERT(layerData); if (verts.isEmpty()) return; if (firstActiveLayer < 0) return; @@ -309,7 +309,7 @@ struct Hemisphere */ void makeVertices(float height, float horizonOffset) { - DENG2_ASSERT(height > 0); + DE_ASSERT(height > 0); rows = de::max(sphereRows, 1); columns = de::max(sphereDetail, 1) * 4; @@ -341,10 +341,10 @@ static Hemisphere hemisphere; } // namespace internal using namespace ::internal; -DENG2_PIMPL(SkyDrawable) -, DENG2_OBSERVES(Sky, Deletion) -, DENG2_OBSERVES(Sky, HeightChange) -, DENG2_OBSERVES(Sky, HorizonOffsetChange) +DE_PIMPL(SkyDrawable) +, DE_OBSERVES(Sky, Deletion) +, DE_OBSERVES(Sky, HeightChange) +, DE_OBSERVES(Sky, HorizonOffsetChange) { Sky const *sky = nullptr; @@ -662,10 +662,10 @@ FrameModelDef *SkyDrawable::modelDef(int modelIndex) const void SkyDrawable::draw(Animator const *animator) const { - DENG2_ASSERT(animator); - DENG2_ASSERT(&animator->sky() == this && d->sky == animator->sky().sky()); - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT(animator); + DE_ASSERT(&animator->sky() == this && d->sky == animator->sky().sky()); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); d->prepare(animator); @@ -702,7 +702,7 @@ void SkyDrawable::consoleRegister() // static //--------------------------------------------------------------------------------------- -DENG2_PIMPL_NOREF(SkyDrawable::Animator) +DE_PIMPL_NOREF(SkyDrawable::Animator) { SkyDrawable *sky = nullptr; @@ -756,7 +756,7 @@ void SkyDrawable::Animator::setSky(SkyDrawable *sky) SkyDrawable &SkyDrawable::Animator::sky() const { - DENG2_ASSERT(d->sky); + DE_ASSERT(d->sky); return *d->sky; } diff --git a/doomsday/apps/client/src/render/skyfixedge.cpp b/doomsday/apps/client/src/render/skyfixedge.cpp index 11b9e73c7a..be41ac9579 100644 --- a/doomsday/apps/client/src/render/skyfixedge.cpp +++ b/doomsday/apps/client/src/render/skyfixedge.cpp @@ -40,7 +40,7 @@ namespace de { static ddouble skyFixFloorZ(Plane const *frontFloor, Plane const *backFloor) { - DENG_UNUSED(backFloor); + DE_UNUSED(backFloor); if(devRendSkyMode || P_IsInVoid(viewPlayer)) return frontFloor->heightSmoothed(); return frontFloor->map().skyFloor().height(); @@ -48,13 +48,13 @@ static ddouble skyFixFloorZ(Plane const *frontFloor, Plane const *backFloor) static ddouble skyFixCeilZ(Plane const *frontCeil, Plane const *backCeil) { - DENG_UNUSED(backCeil); + DE_UNUSED(backCeil); if(devRendSkyMode || P_IsInVoid(viewPlayer)) return frontCeil->heightSmoothed(); return frontCeil->map().skyCeiling().height(); } -DENG2_PIMPL_NOREF(SkyFixEdge::Event) +DE_PIMPL_NOREF(SkyFixEdge::Event) { SkyFixEdge &owner; ddouble distance; @@ -83,7 +83,7 @@ Vec3d SkyFixEdge::Event::origin() const return d->owner.pOrigin() + d->owner.pDirection() * distance(); } -DENG2_PIMPL(SkyFixEdge) +DE_PIMPL(SkyFixEdge) { HEdge *hedge; FixType fixType; @@ -117,7 +117,7 @@ DENG2_PIMPL(SkyFixEdge) */ bool wallSectionNeedsSkyFix() const { - DENG_ASSERT(hedge->hasFace()); + DE_ASSERT(hedge->hasFace()); bool const lower = fixType == SkyFixEdge::Lower; diff --git a/doomsday/apps/client/src/render/stateanimator.cpp b/doomsday/apps/client/src/render/stateanimator.cpp index a99b0fd94d..154fcba936 100644 --- a/doomsday/apps/client/src/render/stateanimator.cpp +++ b/doomsday/apps/client/src/render/stateanimator.cpp @@ -64,8 +64,8 @@ static String const DEFAULT_MATERIAL ("default"); static int const ANIM_DEFAULT_PRIORITY = 1; -DENG2_PIMPL(StateAnimator) -, DENG2_OBSERVES(Variable, Change) +DE_PIMPL(StateAnimator) +, DE_OBSERVES(Variable, Change) { enum BindOperation { Bind, Unbind }; @@ -326,8 +326,8 @@ DENG2_PIMPL(StateAnimator) } } - DENG2_ASSERT(passIndex == passCount); - DENG2_ASSERT(indexForPassName.size() == passCount); + DE_ASSERT(passIndex == passCount); + DE_ASSERT(indexForPassName.size() == passCount); updatePassMask(); updatePassMaterials(); @@ -451,7 +451,7 @@ DENG2_PIMPL(StateAnimator) } else { - DENG2_ASSERT(var.name() == VAR_ENABLED); + DE_ASSERT(var.name() == VAR_ENABLED); // This is called when one of the "(pass).enabled" variables is modified. updatePassMask(); @@ -488,7 +488,7 @@ DENG2_PIMPL(StateAnimator) appearance.passMask.fill(false); for (String name : enabledPasses.keys()) { - DENG2_ASSERT(indexForPassName.contains(name)); + DE_ASSERT(indexForPassName.contains(name)); appearance.passMask.setBit(indexForPassName[name], true); } } diff --git a/doomsday/apps/client/src/render/trianglestripbuilder.cpp b/doomsday/apps/client/src/render/trianglestripbuilder.cpp index 0f8edea8a0..d107363f58 100644 --- a/doomsday/apps/client/src/render/trianglestripbuilder.cpp +++ b/doomsday/apps/client/src/render/trianglestripbuilder.cpp @@ -23,7 +23,7 @@ using namespace de; -DENG2_PIMPL(TriangleStripBuilder) +DE_PIMPL(TriangleStripBuilder) { ClockDirection direction; bool buildTexCoords; diff --git a/doomsday/apps/client/src/render/viewports.cpp b/doomsday/apps/client/src/render/viewports.cpp index 9aa9e0f4ba..a550c6abe7 100644 --- a/doomsday/apps/client/src/render/viewports.cpp +++ b/doomsday/apps/client/src/render/viewports.cpp @@ -110,21 +110,21 @@ void R_ResetFrameCount() } #undef R_SetViewOrigin -DENG_EXTERN_C void R_SetViewOrigin(dint consoleNum, coord_t const origin[3]) +DE_EXTERN_C void R_SetViewOrigin(dint consoleNum, coord_t const origin[3]) { if(consoleNum < 0 || consoleNum >= DDMAXPLAYERS) return; DD_Player(consoleNum)->viewport().latest.origin = Vec3d(origin); } #undef R_SetViewAngle -DENG_EXTERN_C void R_SetViewAngle(dint consoleNum, angle_t angle) +DE_EXTERN_C void R_SetViewAngle(dint consoleNum, angle_t angle) { if(consoleNum < 0 || consoleNum >= DDMAXPLAYERS) return; DD_Player(consoleNum)->viewport().latest.setAngle(angle); } #undef R_SetViewPitch -DENG_EXTERN_C void R_SetViewPitch(dint consoleNum, dfloat pitch) +DE_EXTERN_C void R_SetViewPitch(dint consoleNum, dfloat pitch) { if(consoleNum < 0 || consoleNum >= DDMAXPLAYERS) return; DD_Player(consoleNum)->viewport().latest.pitch = pitch; @@ -137,7 +137,7 @@ void R_SetupDefaultViewWindow(dint consoleNum) vd->window = vd->windowOld = - vd->windowTarget = Rectanglei::fromSize(Vec2i(0, 0), Vec2ui(DENG_GAMEVIEW_WIDTH, DENG_GAMEVIEW_HEIGHT)); + vd->windowTarget = Rectanglei::fromSize(Vec2i(0, 0), Vec2ui(DE_GAMEVIEW_WIDTH, DE_GAMEVIEW_HEIGHT)); vd->windowInter = 1; } @@ -164,7 +164,7 @@ void R_ViewWindowTicker(dint consoleNum, timespan_t ticLength) } #undef R_ViewWindowGeometry -DENG_EXTERN_C dint R_ViewWindowGeometry(dint player, RectRaw *geometry) +DE_EXTERN_C dint R_ViewWindowGeometry(dint player, RectRaw *geometry) { if(!geometry) return false; if(player < 0 || player >= DDMAXPLAYERS) return false; @@ -178,7 +178,7 @@ DENG_EXTERN_C dint R_ViewWindowGeometry(dint player, RectRaw *geometry) } #undef R_ViewWindowOrigin -DENG_EXTERN_C dint R_ViewWindowOrigin(dint player, Point2Raw *origin) +DE_EXTERN_C dint R_ViewWindowOrigin(dint player, Point2Raw *origin) { if(!origin) return false; if(player < 0 || player >= DDMAXPLAYERS) return false; @@ -190,7 +190,7 @@ DENG_EXTERN_C dint R_ViewWindowOrigin(dint player, Point2Raw *origin) } #undef R_ViewWindowSize -DENG_EXTERN_C dint R_ViewWindowSize(dint player, Size2Raw *size) +DE_EXTERN_C dint R_ViewWindowSize(dint player, Size2Raw *size) { if(!size) return false; if(player < 0 || player >= DDMAXPLAYERS) return false; @@ -207,7 +207,7 @@ DENG_EXTERN_C dint R_ViewWindowSize(dint player, Size2Raw *size) * refresh only. */ #undef R_SetViewWindowGeometry -DENG_EXTERN_C void R_SetViewWindowGeometry(dint player, RectRaw const *geometry, dd_bool interpolate) +DE_EXTERN_C void R_SetViewWindowGeometry(dint player, RectRaw const *geometry, dd_bool interpolate) { dint p = P_ConsoleToLocal(player); if(p < 0) return; @@ -253,7 +253,7 @@ DENG_EXTERN_C void R_SetViewWindowGeometry(dint player, RectRaw const *geometry, } #undef R_ViewPortGeometry -DENG_EXTERN_C dint R_ViewPortGeometry(dint player, RectRaw *geometry) +DE_EXTERN_C dint R_ViewPortGeometry(dint player, RectRaw *geometry) { if(!geometry) return false; @@ -269,7 +269,7 @@ DENG_EXTERN_C dint R_ViewPortGeometry(dint player, RectRaw *geometry) } #undef R_ViewPortOrigin -DENG_EXTERN_C dint R_ViewPortOrigin(dint player, Point2Raw *origin) +DE_EXTERN_C dint R_ViewPortOrigin(dint player, Point2Raw *origin) { if(!origin) return false; @@ -283,7 +283,7 @@ DENG_EXTERN_C dint R_ViewPortOrigin(dint player, Point2Raw *origin) } #undef R_ViewPortSize -DENG_EXTERN_C dint R_ViewPortSize(dint player, Size2Raw *size) +DE_EXTERN_C dint R_ViewPortSize(dint player, Size2Raw *size) { if(!size) return false; @@ -297,7 +297,7 @@ DENG_EXTERN_C dint R_ViewPortSize(dint player, Size2Raw *size) } #undef R_SetViewPortPlayer -DENG_EXTERN_C void R_SetViewPortPlayer(dint consoleNum, dint viewPlayer) +DE_EXTERN_C void R_SetViewPortPlayer(dint consoleNum, dint viewPlayer) { dint p = P_ConsoleToLocal(consoleNum); if(p != -1) @@ -312,12 +312,12 @@ DENG_EXTERN_C void R_SetViewPortPlayer(dint consoleNum, dint viewPlayer) */ void R_UpdateViewPortGeometry(viewport_t *port, dint col, dint row) { - DENG2_ASSERT(port); + DE_ASSERT(port); - Rectanglei newGeom = Rectanglei(Vec2i(DENG_GAMEVIEW_X + col * DENG_GAMEVIEW_WIDTH / gridCols, - DENG_GAMEVIEW_Y + row * DENG_GAMEVIEW_HEIGHT / gridRows), - Vec2i(DENG_GAMEVIEW_X + (col+1) * DENG_GAMEVIEW_WIDTH / gridCols, - DENG_GAMEVIEW_Y + (row+1) * DENG_GAMEVIEW_HEIGHT / gridRows)); + Rectanglei newGeom = Rectanglei(Vec2i(DE_GAMEVIEW_X + col * DE_GAMEVIEW_WIDTH / gridCols, + DE_GAMEVIEW_Y + row * DE_GAMEVIEW_HEIGHT / gridRows), + Vec2i(DE_GAMEVIEW_X + (col+1) * DE_GAMEVIEW_WIDTH / gridCols, + DE_GAMEVIEW_Y + (row+1) * DE_GAMEVIEW_HEIGHT / gridRows)); ddhook_viewport_reshape_t p; if(port->geometry == newGeom) return; @@ -435,7 +435,7 @@ void R_CheckViewerLimits(viewer_t *src, viewer_t *dst) */ viewer_t R_SharpViewer(ClientPlayer &player) { - DENG2_ASSERT(player.publicData().mo); + DE_ASSERT(player.publicData().mo); ddplayer_t const &ddpl = player.publicData(); @@ -517,7 +517,7 @@ void R_NewSharpWorld() void R_UpdateViewer(dint consoleNum) { - DENG2_ASSERT(consoleNum >= 0 && consoleNum < DDMAXPLAYERS); + DE_ASSERT(consoleNum >= 0 && consoleNum < DDMAXPLAYERS); dint const VIEWPOS_MAX_SMOOTHDISTANCE = 172; @@ -695,15 +695,15 @@ void R_RenderPlayerViewBorder() void R_UseViewPort(viewport_t const *vp) { - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); if (!vp) { currentViewport = nullptr; /*ClientWindow::main().game().glApplyViewport( - Rectanglei::fromSize(Vec2i(DENG_GAMEVIEW_X, DENG_GAMEVIEW_Y), - Vec2ui(DENG_GAMEVIEW_WIDTH, DENG_GAMEVIEW_HEIGHT)));*/ + Rectanglei::fromSize(Vec2i(DE_GAMEVIEW_X, DE_GAMEVIEW_Y), + Vec2ui(DE_GAMEVIEW_WIDTH, DE_GAMEVIEW_HEIGHT)));*/ } else { @@ -761,7 +761,7 @@ void R_RenderBlankView() static void setupPlayerSprites() { - DENG2_ASSERT(viewPlayer); + DE_ASSERT(viewPlayer); // There are no 3D psprites. ::psp3d = false; @@ -905,10 +905,10 @@ enum ViewState { Default2D, PlayerView3D, PlayerSprite2D }; static void changeViewState(ViewState viewState) //, viewport_t const *port, viewdata_t const *viewData) { - //DENG2_ASSERT(port && viewData); + //DE_ASSERT(port && viewData); - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); switch (viewState) { @@ -1009,7 +1009,7 @@ static void changeViewState(ViewState viewState) //, viewport_t const *port, vie } #undef R_RenderPlayerView -DENG_EXTERN_C void R_RenderPlayerView(dint num) +DE_EXTERN_C void R_RenderPlayerView(dint num) { if (num < 0 || num >= DDMAXPLAYERS) return; // Huh? player_t *player = DD_Player(num); @@ -1056,7 +1056,7 @@ DENG_EXTERN_C void R_RenderPlayerView(dint num) } // Go to wireframe mode? -#if defined (DENG_OPENGL) +#if defined (DE_OPENGL) if (renderWireframe) { LIBGUI_GL.glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); @@ -1079,7 +1079,7 @@ DENG_EXTERN_C void R_RenderPlayerView(dint num) changeViewState(PlayerSprite2D); // Don't render in wireframe mode with 2D psprites. -#if defined (DENG_OPENGL) +#if defined (DE_OPENGL) if (renderWireframe) { LIBGUI_GL.glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); @@ -1088,7 +1088,7 @@ DENG_EXTERN_C void R_RenderPlayerView(dint num) Rend_Draw2DPlayerSprites(); // If the 2D versions are needed. -#if defined (DENG_OPENGL) +#if defined (DE_OPENGL) if (renderWireframe) { LIBGUI_GL.glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); @@ -1114,7 +1114,7 @@ DENG_EXTERN_C void R_RenderPlayerView(dint num) DGL_Flush(); -#if defined (DENG_OPENGL) +#if defined (DE_OPENGL) // Back from wireframe mode? if (renderWireframe) { @@ -1155,7 +1155,7 @@ void R_RenderViewPort(int playerNum) viewport_t const *vp = &viewportOfLocalPlayer[localNum]; - DENG2_ASSERT(vp->console == playerNum); + DE_ASSERT(vp->console == playerNum); dint const oldDisplay = displayPlayer; displayPlayer = vp->console; @@ -1220,7 +1220,7 @@ void R_ClearViewData() * thank for this nonsense (Hexen's sector special 200)... -ds */ #undef R_SkyParams -DENG_EXTERN_C void R_SkyParams(dint layerIndex, dint param, void * /*data*/) +DE_EXTERN_C void R_SkyParams(dint layerIndex, dint param, void * /*data*/) { LOG_AS("R_SkyParams"); if (!ClientApp::world().hasMap()) @@ -1248,13 +1248,13 @@ DENG_EXTERN_C void R_SkyParams(dint layerIndex, dint param, void * /*data*/) bool R_ViewerSubspaceIsVisible(ConvexSubspace const &subspace) { - DENG2_ASSERT(subspace.indexInMap() != MapElement::NoIndex); + DE_ASSERT(subspace.indexInMap() != MapElement::NoIndex); return subspacesVisible.testBit(subspace.indexInMap()); } void R_ViewerSubspaceMarkVisible(ConvexSubspace const &subspace, bool yes) { - DENG2_ASSERT(subspace.indexInMap() != MapElement::NoIndex); + DE_ASSERT(subspace.indexInMap() != MapElement::NoIndex); subspacesVisible.setBit(subspace.indexInMap(), yes); } @@ -1299,8 +1299,8 @@ bool R_ViewerLumobjIsHidden(dint idx) static void markLumobjClipped(Lumobj const &lob, bool yes = true) { dint const index = lob.indexInMap(); - DENG_ASSERT(index >= 0 && index < lob.map().lumobjCount()); - DENG_ASSERT(index < frameLuminous.size()); + DE_ASSERT(index >= 0 && index < lob.map().lumobjCount()); + DE_ASSERT(index < frameLuminous.size()); frameLuminous[index].isClipped = yes? 1 : 0; } @@ -1460,7 +1460,7 @@ angle_t viewer_t::angle() const D_CMD(ViewGrid) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); // Recalculate viewports. return R_SetViewGrid(String(argv[1]).toInt(), String(argv[2]).toInt()); } diff --git a/doomsday/apps/client/src/render/vissprite.cpp b/doomsday/apps/client/src/render/vissprite.cpp index 287aa05b4d..9767073636 100644 --- a/doomsday/apps/client/src/render/vissprite.cpp +++ b/doomsday/apps/client/src/render/vissprite.cpp @@ -77,7 +77,7 @@ void VisSprite_SetupSprite(vissprite_t *spr, VisEntityPose const &pose, VisEntit MaterialVariantSpec const &spec = Rend_SpriteMaterialSpec(tClass, tMap); MaterialAnimator *matAnimator = &material.getAnimator(spec); - DENG2_ASSERT((tClass == 0 && tMap == 0) || + DE_ASSERT((tClass == 0 && tMap == 0) || (spec.primarySpec->variant.flags & TSF_HAS_COLORPALETTE_XLAT)); spr->pose = pose; diff --git a/doomsday/apps/client/src/render/vr.cpp b/doomsday/apps/client/src/render/vr.cpp index 9b27deffb2..8fe4823c70 100644 --- a/doomsday/apps/client/src/render/vr.cpp +++ b/doomsday/apps/client/src/render/vr.cpp @@ -47,8 +47,8 @@ static float vrDominantEye; VRConfig &vrCfg() { - DENG2_ASSERT(DENG2_BASE_GUI_APP != 0); - return DENG2_BASE_GUI_APP->vr(); + DE_ASSERT(DE_BASE_GUI_APP != 0); + return DE_BASE_GUI_APP->vr(); } /* @@ -130,13 +130,13 @@ static void vrNonRiftFovXChanged() D_CMD(LoadRiftParams) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); return VR_LoadRiftParameters(); }*/ D_CMD(ResetRiftPose) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); vrCfg().oculusRift().resetTracking(); LOG_INPUT_MSG("Reset Oculus Rift position tracking"); return true; diff --git a/doomsday/apps/client/src/render/walledge.cpp b/doomsday/apps/client/src/render/walledge.cpp index 14df411446..5b70e1fb21 100644 --- a/doomsday/apps/client/src/render/walledge.cpp +++ b/doomsday/apps/client/src/render/walledge.cpp @@ -52,7 +52,7 @@ using namespace world; */ static bool shouldSmoothNormals(Surface &sufA, Surface &sufB, binangle_t angleDiff) { - DENG2_UNUSED2(sufA, sufB); + DE_UNUSED(sufA, sufB); return INRANGE_OF(angleDiff, BANG_180, BANG_45); } @@ -512,7 +512,7 @@ struct WallEdge::Impl : public IHPlane return events.size; } -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG void printIntercepts() const { EventIndex index = 0; @@ -528,13 +528,13 @@ struct WallEdge::Impl : public IHPlane */ void assertInterceptsInRange(ddouble low, ddouble hi) const { -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG foreach (Event const &icpt, events) { - DENG2_ASSERT(icpt.distance() >= low && icpt.distance() <= hi); + DE_ASSERT(icpt.distance() >= low && icpt.distance() <= hi); } #else - DENG2_UNUSED2(low, hi); + DE_UNUSED(low, hi); #endif } @@ -629,7 +629,7 @@ struct WallEdge::Impl : public IHPlane void prepareEvents() { - DENG2_ASSERT(self->isValid()); + DE_ASSERT(self->isValid()); needSortEvents = false; @@ -651,7 +651,7 @@ struct WallEdge::Impl : public IHPlane sortAndMergeIntercepts(); } -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG // Sanity check. assertInterceptsInRange(0, 1); #endif diff --git a/doomsday/apps/client/src/resource/abstractfont.cpp b/doomsday/apps/client/src/resource/abstractfont.cpp index 2a6d3e37ad..58f88a7b76 100644 --- a/doomsday/apps/client/src/resource/abstractfont.cpp +++ b/doomsday/apps/client/src/resource/abstractfont.cpp @@ -29,7 +29,7 @@ AbstractFont::AbstractFont(FontManifest &manifest) AbstractFont::~AbstractFont() { - DENG2_FOR_AUDIENCE(Deletion, i) i->fontBeingDeleted(*this); + DE_FOR_AUDIENCE(Deletion, i) i->fontBeingDeleted(*this); } void AbstractFont::glInit() const diff --git a/doomsday/apps/client/src/resource/base/api_material.cpp b/doomsday/apps/client/src/resource/base/api_material.cpp index 33bcb294f3..458ec672c8 100644 --- a/doomsday/apps/client/src/resource/base/api_material.cpp +++ b/doomsday/apps/client/src/resource/base/api_material.cpp @@ -17,7 +17,7 @@ * http://www.gnu.org/licenses */ -#define DENG_NO_API_MACROS_MATERIALS +#define DE_NO_API_MACROS_MATERIALS #include "de_base.h" #include "api_material.h" @@ -29,7 +29,7 @@ using namespace de; #undef DD_MaterialForTextureUri -DENG_EXTERN_C world_Material *DD_MaterialForTextureUri(uri_s const *textureUri) +DE_EXTERN_C world_Material *DD_MaterialForTextureUri(uri_s const *textureUri) { if (!textureUri) return nullptr; // Not found. @@ -56,14 +56,14 @@ DENG_EXTERN_C world_Material *DD_MaterialForTextureUri(uri_s const *textureUri) } #undef Materials_ComposeUri -DENG_EXTERN_C struct uri_s *Materials_ComposeUri(materialid_t materialId) +DE_EXTERN_C struct uri_s *Materials_ComposeUri(materialid_t materialId) { world::MaterialManifest &manifest = world::Materials::get().toMaterialManifest(materialId); return reinterpret_cast(new de::Uri(manifest.composeUri())); } #undef Materials_ResolveUri -DENG_EXTERN_C materialid_t Materials_ResolveUri(struct uri_s const *uri) +DE_EXTERN_C materialid_t Materials_ResolveUri(struct uri_s const *uri) { try { @@ -75,7 +75,7 @@ DENG_EXTERN_C materialid_t Materials_ResolveUri(struct uri_s const *uri) } #undef Materials_ResolveUriCString -DENG_EXTERN_C materialid_t Materials_ResolveUriCString(char const *uriCString) +DE_EXTERN_C materialid_t Materials_ResolveUriCString(char const *uriCString) { if (uriCString && uriCString[0]) { @@ -89,7 +89,7 @@ DENG_EXTERN_C materialid_t Materials_ResolveUriCString(char const *uriCString) return NOMATERIALID; } -DENG_DECLARE_API(Material) = +DE_DECLARE_API(Material) = { { DE_API_MATERIALS }, DD_MaterialForTextureUri, diff --git a/doomsday/apps/client/src/resource/base/api_resource.cpp b/doomsday/apps/client/src/resource/base/api_resource.cpp index 12a734ad19..a9f551e8f3 100644 --- a/doomsday/apps/client/src/resource/base/api_resource.cpp +++ b/doomsday/apps/client/src/resource/base/api_resource.cpp @@ -17,7 +17,7 @@ * http://www.gnu.org/licenses */ -#define DENG_NO_API_MACROS_RESOURCE +#define DE_NO_API_MACROS_RESOURCE #include "de_base.h" #include "api_resource.h" #include "gl/gl_tex.h" // averagealpha_analysis_t, etc... @@ -35,7 +35,7 @@ using namespace de; #undef Textures_UniqueId2 -DENG_EXTERN_C int Textures_UniqueId2(uri_s const *_uri, dd_bool quiet) +DE_EXTERN_C int Textures_UniqueId2(uri_s const *_uri, dd_bool quiet) { LOG_AS("Textures_UniqueId"); if(!_uri) return -1; @@ -57,19 +57,19 @@ DENG_EXTERN_C int Textures_UniqueId2(uri_s const *_uri, dd_bool quiet) } #undef Textures_UniqueId -DENG_EXTERN_C int Textures_UniqueId(uri_s const *uri) +DE_EXTERN_C int Textures_UniqueId(uri_s const *uri) { return Textures_UniqueId2(uri, false); } #undef R_CreateAnimGroup -DENG_EXTERN_C int R_CreateAnimGroup(int flags) +DE_EXTERN_C int R_CreateAnimGroup(int flags) { return res::AnimGroups::get().newAnimGroup(flags & ~AGF_PRECACHE).id(); } #undef R_AddAnimGroupFrame -DENG_EXTERN_C void R_AddAnimGroupFrame(int groupId, uri_s const *textureUri_, int tics, int randomTics) +DE_EXTERN_C void R_AddAnimGroupFrame(int groupId, uri_s const *textureUri_, int tics, int randomTics) { LOG_AS("R_AddAnimGroupFrame"); @@ -96,10 +96,10 @@ DENG_EXTERN_C void R_AddAnimGroupFrame(int groupId, uri_s const *textureUri_, in } #undef R_CreateColorPalette -DENG_EXTERN_C colorpaletteid_t R_CreateColorPalette(char const *colorFormatDescriptor, +DE_EXTERN_C colorpaletteid_t R_CreateColorPalette(char const *colorFormatDescriptor, char const *nameCStr, uint8_t const *colorData, int colorCount) { - DENG2_ASSERT(nameCStr != 0 && colorFormatDescriptor != 0 && colorData != 0); + DE_ASSERT(nameCStr != 0 && colorFormatDescriptor != 0 && colorData != 0); LOG_AS("R_CreateColorPalette"); @@ -142,10 +142,10 @@ DENG_EXTERN_C colorpaletteid_t R_CreateColorPalette(char const *colorFormatDescr } #undef R_CreateColorPaletteTranslation -DENG_EXTERN_C void R_CreateColorPaletteTranslation(colorpaletteid_t paletteId, +DE_EXTERN_C void R_CreateColorPaletteTranslation(colorpaletteid_t paletteId, ddstring_s const *translationId, uint8_t const *mappings_) { - DENG2_ASSERT(mappings_ != 0); + DE_ASSERT(mappings_ != 0); LOG_AS("R_CreateColorPaletteTranslation"); @@ -159,7 +159,7 @@ DENG_EXTERN_C void R_CreateColorPaletteTranslation(colorpaletteid_t paletteId, for(int i = 0; i < colorCount; ++i) { int const palIdx = mappings_[i]; - DENG2_ASSERT(palIdx >= 0 && palIdx < colorCount); + DE_ASSERT(palIdx >= 0 && palIdx < colorCount); mappings[i] = palIdx; } @@ -181,7 +181,7 @@ DENG_EXTERN_C void R_CreateColorPaletteTranslation(colorpaletteid_t paletteId, } #undef R_GetColorPaletteNumForName -DENG_EXTERN_C colorpaletteid_t R_GetColorPaletteNumForName(char const *name) +DE_EXTERN_C colorpaletteid_t R_GetColorPaletteNumForName(char const *name) { LOG_AS("R_GetColorPaletteNumForName"); try @@ -197,7 +197,7 @@ DENG_EXTERN_C colorpaletteid_t R_GetColorPaletteNumForName(char const *name) } #undef R_GetColorPaletteNameForNum -DENG_EXTERN_C char const *R_GetColorPaletteNameForNum(colorpaletteid_t id) +DE_EXTERN_C char const *R_GetColorPaletteNameForNum(colorpaletteid_t id) { LOG_AS("R_GetColorPaletteNameForNum"); try @@ -214,7 +214,7 @@ DENG_EXTERN_C char const *R_GetColorPaletteNameForNum(colorpaletteid_t id) } #undef R_GetColorPaletteRGBubv -DENG_EXTERN_C void R_GetColorPaletteRGBubv(colorpaletteid_t paletteId, int colorIdx, uint8_t rgb[3], +DE_EXTERN_C void R_GetColorPaletteRGBubv(colorpaletteid_t paletteId, int colorIdx, uint8_t rgb[3], dd_bool applyTexGamma) { LOG_AS("R_GetColorPaletteRGBubv"); @@ -249,7 +249,7 @@ DENG_EXTERN_C void R_GetColorPaletteRGBubv(colorpaletteid_t paletteId, int color } #undef R_GetColorPaletteRGBf -DENG_EXTERN_C void R_GetColorPaletteRGBf(colorpaletteid_t paletteId, int colorIdx, float rgb[3], +DE_EXTERN_C void R_GetColorPaletteRGBf(colorpaletteid_t paletteId, int colorIdx, float rgb[3], dd_bool applyTexGamma) { LOG_AS("R_GetColorPaletteRGBf"); @@ -289,7 +289,7 @@ DENG_EXTERN_C void R_GetColorPaletteRGBf(colorpaletteid_t paletteId, int colorId } #undef R_ComposePatchPath -DENG_EXTERN_C AutoStr *R_ComposePatchPath(patchid_t id) +DE_EXTERN_C AutoStr *R_ComposePatchPath(patchid_t id) { LOG_AS("R_ComposePatchPath"); try @@ -306,7 +306,7 @@ DENG_EXTERN_C AutoStr *R_ComposePatchPath(patchid_t id) } #undef R_ComposePatchUri -DENG_EXTERN_C uri_s *R_ComposePatchUri(patchid_t id) +DE_EXTERN_C uri_s *R_ComposePatchUri(patchid_t id) { try { @@ -322,15 +322,15 @@ DENG_EXTERN_C uri_s *R_ComposePatchUri(patchid_t id) } #undef R_DeclarePatch -DENG_EXTERN_C patchid_t R_DeclarePatch(char const *encodedName) +DE_EXTERN_C patchid_t R_DeclarePatch(char const *encodedName) { return res::Textures::get().declarePatch(encodedName); } #undef R_GetPatchInfo -DENG_EXTERN_C dd_bool R_GetPatchInfo(patchid_t id, patchinfo_t *info) +DE_EXTERN_C dd_bool R_GetPatchInfo(patchid_t id, patchinfo_t *info) { - DENG2_ASSERT(info); + DE_ASSERT(info); LOG_AS("R_GetPatchInfo"); de::zapPtr(info); @@ -378,7 +378,7 @@ DENG_EXTERN_C dd_bool R_GetPatchInfo(patchid_t id, patchinfo_t *info) return false; } -DENG_DECLARE_API(R) = +DE_DECLARE_API(R) = { { DE_API_RESOURCE }, R_DeclarePatch, diff --git a/doomsday/apps/client/src/resource/bitmapfont.cpp b/doomsday/apps/client/src/resource/bitmapfont.cpp index 5aeb999d97..092cb3fbdf 100644 --- a/doomsday/apps/client/src/resource/bitmapfont.cpp +++ b/doomsday/apps/client/src/resource/bitmapfont.cpp @@ -52,7 +52,7 @@ struct Glyph Rectanglei texCoords; }; -DENG2_PIMPL(BitmapFont) +DE_PIMPL(BitmapFont) { String filePath; ///< The "archived" version of this font (if any). GLuint texGLName; ///< GL-texture name. @@ -115,7 +115,7 @@ DENG2_PIMPL(BitmapFont) uint8_t *readFormat0(FileHandle *file) { - DENG2_ASSERT(file != 0); + DE_ASSERT(file != 0); self()._flags |= AbstractFont::Colorize; self()._flags &= ~AbstractFont::Shadowed; @@ -170,7 +170,7 @@ DENG2_PIMPL(BitmapFont) uint8_t *readFormat2(FileHandle *file) { - DENG2_ASSERT(file != 0); + DE_ASSERT(file != 0); self()._flags |= AbstractFont::Colorize | AbstractFont::Shadowed; @@ -195,7 +195,7 @@ DENG2_PIMPL(BitmapFont) for(int i = 0; i < glyphCount; ++i) { ushort code = inShort(file); - DENG2_ASSERT(code < MAX_CHARS); + DE_ASSERT(code < MAX_CHARS); Glyph *ch = &glyphs[code]; ushort x = inShort(file); @@ -312,7 +312,7 @@ void BitmapFont::glInit() const case 2: pixels = d->readFormat2(hndl); break; default: - DENG2_ASSERT_FAIL("BitmapFont: Format not implemented"); + DE_ASSERT_FAIL("BitmapFont: Format not implemented"); } if(!pixels) { diff --git a/doomsday/apps/client/src/resource/clientmaterial.cpp b/doomsday/apps/client/src/resource/clientmaterial.cpp index 5d89e5b1d2..b7c51aed45 100644 --- a/doomsday/apps/client/src/resource/clientmaterial.cpp +++ b/doomsday/apps/client/src/resource/clientmaterial.cpp @@ -33,7 +33,7 @@ using namespace de; -DENG2_PIMPL_NOREF(ClientMaterial::Decoration) +DE_PIMPL_NOREF(ClientMaterial::Decoration) { ClientMaterial *material = nullptr; ///< Owning Material. Vec2i patternSkip; ///< Pattern skip intervals. @@ -54,13 +54,13 @@ ClientMaterial::Decoration::~Decoration() ClientMaterial &ClientMaterial::Decoration::material() { - DENG2_ASSERT(d->material); + DE_ASSERT(d->material); return *d->material; } ClientMaterial const &ClientMaterial::Decoration::material() const { - DENG2_ASSERT(d->material); + DE_ASSERT(d->material); return *d->material; } @@ -102,7 +102,7 @@ String ClientMaterial::Decoration::describe() const String ClientMaterial::Decoration::description() const { int const numStages = stageCount(); - String str = _E(b) + describe() + _E(.) + " (" + String::number(numStages) + " stage" + DENG2_PLURAL_S(numStages) + "):"; + String str = _E(b) + describe() + _E(.) + " (" + String::number(numStages) + " stage" + DE_PLURAL_S(numStages) + "):"; for (int i = 0; i < numStages; ++i) { str += String("\n [%1] ").arg(i, 2) + _E(>) + stage(i).description() + _E(<); @@ -110,7 +110,7 @@ String ClientMaterial::Decoration::description() const return str; } -DENG2_PIMPL(ClientMaterial) +DE_PIMPL(ClientMaterial) { AudioEnvironmentId audioEnvironment { AE_NONE }; diff --git a/doomsday/apps/client/src/resource/clientresources.cpp b/doomsday/apps/client/src/resource/clientresources.cpp index 196447a374..f1a296c005 100644 --- a/doomsday/apps/client/src/resource/clientresources.cpp +++ b/doomsday/apps/client/src/resource/clientresources.cpp @@ -109,12 +109,12 @@ ClientResources &ClientResources::get() // static return static_cast(Resources::get()); } -DENG2_PIMPL(ClientResources) -, DENG2_OBSERVES(FontScheme, ManifestDefined) -, DENG2_OBSERVES(FontManifest, Deletion) -, DENG2_OBSERVES(AbstractFont, Deletion) -, DENG2_OBSERVES(res::ColorPalettes, Addition) -, DENG2_OBSERVES(res::ColorPalette, ColorTableChange) +DE_PIMPL(ClientResources) +, DE_OBSERVES(FontScheme, ManifestDefined) +, DE_OBSERVES(FontManifest, Deletion) +, DE_OBSERVES(AbstractFont, Deletion) +, DE_OBSERVES(res::ColorPalettes, Addition) +, DE_OBSERVES(res::ColorPalette, ColorTableChange) { typedef QHash RawTextureHash; RawTextureHash rawTexHash; @@ -229,7 +229,7 @@ DENG2_PIMPL(ClientResources) void createFontScheme(String name) { - DENG2_ASSERT(name.length() >= FontScheme::min_name_length); + DE_ASSERT(name.length() >= FontScheme::min_name_length); // Create a new scheme. FontScheme *newScheme = new FontScheme(name); @@ -291,7 +291,7 @@ DENG2_PIMPL(ClientResources) case PSpriteContext: primaryContext = TC_PSPRITE_DIFFUSE; break; case SkySphereContext: primaryContext = TC_SKYSPHERE_DIFFUSE; break; - default: DENG2_ASSERT(false); + default: DE_ASSERT(false); } TextureVariantSpec const &primarySpec = @@ -317,7 +317,7 @@ DENG2_PIMPL(ClientResources) int wrapS, int wrapT, int minFilter, int magFilter, int anisoFilter, dd_bool mipmapped, dd_bool gammaCorrection, dd_bool noStretch, dd_bool toAlpha) { - DENG2_ASSERT(tc == TC_UNKNOWN || VALID_TEXTUREVARIANTUSAGECONTEXT(tc)); + DE_ASSERT(tc == TC_UNKNOWN || VALID_TEXTUREVARIANTUSAGECONTEXT(tc)); flags &= ~TSF_INTERNAL_MASK; @@ -355,7 +355,7 @@ DENG2_PIMPL(ClientResources) TextureVariantSpec &linkTextureSpec(TextureVariantSpec *spec) { - DENG2_ASSERT(spec != 0); + DE_ASSERT(spec != 0); switch (spec->type) { @@ -617,7 +617,7 @@ DENG2_PIMPL(ClientResources) FrameModel *modelForId(modelid_t id) { - DENG2_ASSERT(modelRepository); + DE_ASSERT(modelRepository); return reinterpret_cast(modelRepository->userPointer(id)); } @@ -680,7 +680,7 @@ DENG2_PIMPL(ClientResources) String findSkinPath(Path const &skinPath, Path const &modelFilePath) { - //DENG2_ASSERT(!skinPath.isEmpty()); + //DE_ASSERT(!skinPath.isEmpty()); // Try the "first choice" directory first. if (!modelFilePath.isEmpty()) @@ -775,7 +775,7 @@ DENG2_PIMPL(ClientResources) << NativePath(modelFilePath).pretty(); } -#ifdef DENG_DEBUG +#ifdef DE_DEBUG LOGDEV_RES_XVERBOSE("Model \"%s\" skins:", NativePath(modelFilePath).pretty()); dint skinIdx = 0; for (FrameModelSkin const &skin : mdl.skins()) @@ -1272,8 +1272,8 @@ void ClientResources::initSystemTextures() void ClientResources::reloadAllResources() { - DENG2_ASSERT_IN_MAIN_THREAD(); - DENG2_ASSERT(QOpenGLContext::currentContext() != nullptr); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT(QOpenGLContext::currentContext() != nullptr); Resources::reloadAllResources(); DD_UpdateEngineState(); @@ -1426,12 +1426,12 @@ TextureVariantSpec const &ClientResources::textureSpec(texturevariantusagecontex magFilter, anisoFilter, mipmapped, gammaCorrection, noStretch, toAlpha); -#ifdef DENG_DEBUG +#ifdef DE_DEBUG if (tClass || tMap) { - DENG2_ASSERT(tvs->variant.flags & TSF_HAS_COLORPALETTE_XLAT); - DENG2_ASSERT(tvs->variant.tClass == tClass); - DENG2_ASSERT(tvs->variant.tMap == tMap); + DE_ASSERT(tvs->variant.flags & TSF_HAS_COLORPALETTE_XLAT); + DE_ASSERT(tvs->variant.tClass == tClass); + DE_ASSERT(tvs->variant.tMap == tMap); } #endif @@ -1547,7 +1547,7 @@ FontManifest &ClientResources::toFontManifest(fontid_t id) const { return *d->fontManifestIdMap[idx]; } - DENG2_ASSERT_FAIL("Bookkeeping error"); + DE_ASSERT_FAIL("Bookkeeping error"); } /// @throw UnknownIdError The specified manifest id is invalid. @@ -1742,8 +1742,8 @@ FrameModelDef *ClientResources::modelDefForState(dint stateIndex, dint select) if (d->stateModefs[stateIndex] < 0) return nullptr; - DENG2_ASSERT(d->stateModefs[stateIndex] >= 0); - DENG2_ASSERT(d->stateModefs[stateIndex] < d->modefs.count()); + DE_ASSERT(d->stateModefs[stateIndex] >= 0); + DE_ASSERT(d->stateModefs[stateIndex] < d->modefs.count()); FrameModelDef *def = &d->modefs[d->stateModefs[stateIndex]]; if (select) @@ -2132,7 +2132,7 @@ static bool isKnownFontSchemeCallback(String name) D_CMD(ListFonts) { - DENG2_UNUSED(src); + DE_UNUSED(src); de::Uri search = de::Uri::fromUserInput(&argv[1], argc - 1, &isKnownFontSchemeCallback); if (!search.scheme().isEmpty() && @@ -2146,10 +2146,10 @@ D_CMD(ListFonts) return true; } -#ifdef DENG_DEBUG +#ifdef DE_DEBUG D_CMD(PrintFontStats) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); LOG_MSG(_E(b) "Font Statistics:"); foreach (FontScheme *scheme, App_Resources().allFontSchemes()) @@ -2164,7 +2164,7 @@ D_CMD(PrintFontStats) } return true; } -#endif // DENG_DEBUG +#endif // DE_DEBUG void ClientResources::consoleRegister() // static { @@ -2173,7 +2173,7 @@ void ClientResources::consoleRegister() // static C_CMD("listfonts", "ss", ListFonts) C_CMD("listfonts", "s", ListFonts) C_CMD("listfonts", "", ListFonts) -#ifdef DENG_DEBUG +#ifdef DE_DEBUG C_CMD("fontstats", NULL, PrintFontStats) #endif } diff --git a/doomsday/apps/client/src/resource/clienttexture.cpp b/doomsday/apps/client/src/resource/clienttexture.cpp index 46f6513916..5e0cacabfb 100644 --- a/doomsday/apps/client/src/resource/clienttexture.cpp +++ b/doomsday/apps/client/src/resource/clienttexture.cpp @@ -30,7 +30,7 @@ using namespace de; -DENG2_PIMPL(ClientTexture) +DE_PIMPL(ClientTexture) { /// Set of (render-) context variants. Variants variants; @@ -47,7 +47,7 @@ DENG2_PIMPL(ClientTexture) while (!variants.isEmpty()) { ClientTexture::Variant *variant = variants.takeFirst(); -#ifdef DENG_DEBUG +#ifdef DE_DEBUG if (variant->glName()) { String textualVariantSpec = variant->spec().asText(); @@ -107,7 +107,7 @@ ClientTexture::Variant *ClientTexture::chooseVariant(ChooseVariantMethod method, } /* -#ifdef DENG_DEBUG +#ifdef DE_DEBUG // 07/04/2011 dj: The "fuzzy selection" features are yet to be implemented. // As such, the following should NOT return a valid variant iff the rest of // this subsystem has been implemented correctly. @@ -115,7 +115,7 @@ ClientTexture::Variant *ClientTexture::chooseVariant(ChooseVariantMethod method, // Presently this is used as a sanity check. if (method == MatchSpec) { - DENG_ASSERT(!chooseVariant(FuzzyMatchSpec, spec)); + DE_ASSERT(!chooseVariant(FuzzyMatchSpec, spec)); } #endif */ @@ -129,7 +129,7 @@ ClientTexture::Variant *ClientTexture::chooseVariant(ChooseVariantMethod method, ClientTexture::Variant *ClientTexture::prepareVariant(TextureVariantSpec const &spec) { Variant *variant = chooseVariant(MatchSpec, spec, true /*can create*/); - DENG2_ASSERT(variant); + DE_ASSERT(variant); variant->prepare(); return variant; } diff --git a/doomsday/apps/client/src/resource/compositebitmapfont.cpp b/doomsday/apps/client/src/resource/compositebitmapfont.cpp index 8c4aaba372..ba68d9a322 100644 --- a/doomsday/apps/client/src/resource/compositebitmapfont.cpp +++ b/doomsday/apps/client/src/resource/compositebitmapfont.cpp @@ -30,7 +30,7 @@ using namespace de; -DENG2_PIMPL(CompositeBitmapFont) +DE_PIMPL(CompositeBitmapFont) { ded_compositefont_t *def; /// Definition on which "this" font is derived (if any). bool needGLInit; diff --git a/doomsday/apps/client/src/resource/fontmanifest.cpp b/doomsday/apps/client/src/resource/fontmanifest.cpp index 8755d4b3c0..98a961c0ad 100644 --- a/doomsday/apps/client/src/resource/fontmanifest.cpp +++ b/doomsday/apps/client/src/resource/fontmanifest.cpp @@ -27,8 +27,8 @@ using namespace de; -DENG2_PIMPL(FontManifest), -DENG2_OBSERVES(AbstractFont, Deletion) +DE_PIMPL(FontManifest), +DE_OBSERVES(AbstractFont, Deletion) { int uniqueId; QScopedPointer(resource); ///< Associated resource (if any). @@ -40,7 +40,7 @@ DENG2_OBSERVES(AbstractFont, Deletion) ~Impl() { - DENG2_FOR_PUBLIC_AUDIENCE(Deletion, i) i->fontManifestBeingDeleted(self()); + DE_FOR_PUBLIC_AUDIENCE(Deletion, i) i->fontManifestBeingDeleted(self()); } // Observes AbstractFont::Deletion. @@ -91,7 +91,7 @@ bool FontManifest::setUniqueId(int newUniqueId) d->uniqueId = newUniqueId; // Notify interested parties that the uniqueId has changed. - DENG2_FOR_AUDIENCE(UniqueIdChange, i) i->fontManifestUniqueIdChanged(*this); + DE_FOR_AUDIENCE(UniqueIdChange, i) i->fontManifestUniqueIdChanged(*this); return true; } diff --git a/doomsday/apps/client/src/resource/fontscheme.cpp b/doomsday/apps/client/src/resource/fontscheme.cpp index 882f484113..c1e5a93a6f 100644 --- a/doomsday/apps/client/src/resource/fontscheme.cpp +++ b/doomsday/apps/client/src/resource/fontscheme.cpp @@ -25,9 +25,9 @@ using namespace de; -DENG2_PIMPL(FontScheme), -DENG2_OBSERVES(FontManifest, UniqueIdChange), -DENG2_OBSERVES(FontManifest, Deletion) +DE_PIMPL(FontScheme), +DE_OBSERVES(FontManifest, UniqueIdChange), +DE_OBSERVES(FontManifest, Deletion) { String name; ///< Symbolic. Index index; ///< Mappings from paths to manifests. @@ -45,7 +45,7 @@ DENG2_OBSERVES(FontManifest, Deletion) ~Impl() { self().clear(); - DENG2_ASSERT(index.isEmpty()); // sanity check. + DE_ASSERT(index.isEmpty()); // sanity check. } bool inline uniqueIdInLutRange(int uniqueId) const @@ -82,12 +82,12 @@ DENG2_OBSERVES(FontManifest, Deletion) /// @pre uniqueIdMap is large enough if initialized! void unlinkInUniqueIdLut(Manifest const &manifest) { - DENG2_ASSERT(&manifest.scheme() == thisPublic); // sanity check. + DE_ASSERT(&manifest.scheme() == thisPublic); // sanity check. // If the lut is already considered 'dirty' do not unlink. if(!uniqueIdLutDirty) { int uniqueId = manifest.uniqueId(); - DENG2_ASSERT(uniqueIdInLutRange(uniqueId)); + DE_ASSERT(uniqueIdInLutRange(uniqueId)); uniqueIdLut[uniqueId - uniqueIdBase] = 0; } } @@ -95,9 +95,9 @@ DENG2_OBSERVES(FontManifest, Deletion) /// @pre uniqueIdLut has been initialized and is large enough! void linkInUniqueIdLut(Manifest &manifest) { - DENG2_ASSERT(&manifest.scheme() == thisPublic); // sanity check. + DE_ASSERT(&manifest.scheme() == thisPublic); // sanity check. int uniqueId = manifest.uniqueId(); - DENG_ASSERT(uniqueIdInLutRange(uniqueId)); + DE_ASSERT(uniqueIdInLutRange(uniqueId)); uniqueIdLut[uniqueId - uniqueIdBase] = &manifest; } @@ -122,7 +122,7 @@ DENG2_OBSERVES(FontManifest, Deletion) } // Fill the LUT with initial values. -#ifdef DENG2_QT_4_7_OR_NEWER +#ifdef DE_QT_4_7_OR_NEWER uniqueIdLut.reserve(lutSize); #endif int i = 0; @@ -195,7 +195,7 @@ FontScheme::Manifest &FontScheme::declare(Path const &path) int const sizeBefore = d->index.size(); Manifest *newManifest = &d->index.insert(path); - DENG2_ASSERT(newManifest != 0); + DE_ASSERT(newManifest != 0); if(d->index.size() != sizeBefore) { @@ -206,7 +206,7 @@ FontScheme::Manifest &FontScheme::declare(Path const &path) newManifest->audienceForDeletion += d; // Notify interested parties that a new manifest was defined in the scheme. - DENG2_FOR_AUDIENCE(ManifestDefined, i) i->fontSchemeManifestDefined(*this, *newManifest); + DE_FOR_AUDIENCE(ManifestDefined, i) i->fontSchemeManifestDefined(*this, *newManifest); } return *newManifest; diff --git a/doomsday/apps/client/src/resource/framemodel.cpp b/doomsday/apps/client/src/resource/framemodel.cpp index 87d322ec13..db471d0349 100644 --- a/doomsday/apps/client/src/resource/framemodel.cpp +++ b/doomsday/apps/client/src/resource/framemodel.cpp @@ -140,7 +140,7 @@ static float avertexnormals[NUMVERTEXNORMALS][3] = { /** * @todo reimplement file loading using de::Reader. */ -DENG2_PIMPL(FrameModel) +DE_PIMPL(FrameModel) { Flags flags; Skins skins; diff --git a/doomsday/apps/client/src/resource/image.cpp b/doomsday/apps/client/src/resource/image.cpp index 66b9b42deb..0b7cc0d1ae 100644 --- a/doomsday/apps/client/src/resource/image.cpp +++ b/doomsday/apps/client/src/resource/image.cpp @@ -41,7 +41,7 @@ #include "render/rend_main.h" // misc global vars awaiting new home -#ifndef DENG2_QT_4_7_OR_NEWER // older than 4.7? +#ifndef DE_QT_4_7_OR_NEWER // older than 4.7? # define constBits bits #endif @@ -351,8 +351,8 @@ bool Image_LoadFromFileWithFormat(image_t &img, char const *format, FileHandle & if (image.colorCount()) { image = image.convertToFormat(QImage::Format_ARGB32); - DENG_ASSERT(!image.colorCount()); - DENG_ASSERT(image.depth() == 32); + DE_ASSERT(!image.colorCount()); + DE_ASSERT(image.depth() == 32); } // Swap the red and blue channels for GL. @@ -417,7 +417,7 @@ uint8_t *GL_LoadImage(image_t &image, String nativePath) Source GL_LoadExtImage(image_t &image, char const *_searchPath, gfxmode_t mode) { - DENG_ASSERT(_searchPath); + DE_ASSERT(_searchPath); try { @@ -449,7 +449,7 @@ Source GL_LoadExtImage(image_t &image, char const *_searchPath, gfxmode_t mode) static dd_bool palettedIsMasked(uint8_t const *pixels, int width, int height) { - DENG2_ASSERT(pixels != 0); + DE_ASSERT(pixels != 0); // Jump to the start of the alpha data. pixels += width * height; for (int i = 0; i < width * height; ++i) @@ -640,7 +640,7 @@ static Source loadPatchComposite(image_t &image, Texture const &tex, image.pixels = (uint8_t *) M_Calloc(2 * image.size.x * image.size.y); res::Composite const &texDef = *reinterpret_cast(tex.userDataPointer()); - DENG2_FOR_EACH_CONST(res::Composite::Components, i, texDef.components()) + DE_FOR_EACH_CONST(res::Composite::Components, i, texDef.components()) { File1 &file = App_FileSystem().lump(i->lumpNum()); ByteRefArray fileData = ByteRefArray(file.cache(), file.size()); diff --git a/doomsday/apps/client/src/resource/materialanimator.cpp b/doomsday/apps/client/src/resource/materialanimator.cpp index 3e9c90e386..261d99b8de 100644 --- a/doomsday/apps/client/src/resource/materialanimator.cpp +++ b/doomsday/apps/client/src/resource/materialanimator.cpp @@ -70,7 +70,7 @@ static DGLuint prepareFlaremap(ClientTexture *texture, int oldIdx) return 0; // Use the automatic selection logic. } -DENG2_PIMPL_NOREF(MaterialAnimator::Decoration) +DE_PIMPL_NOREF(MaterialAnimator::Decoration) { MaterialDecoration *matDecor = nullptr; @@ -96,7 +96,7 @@ DENG2_PIMPL_NOREF(MaterialAnimator::Decoration) bool useInterpolation() const { - DENG2_ASSERT(matDecor); + DE_ASSERT(matDecor); if (auto const *light = maybeAs(matDecor)) { return light->useInterpolation(); @@ -113,7 +113,7 @@ MaterialAnimator::Decoration::Decoration(MaterialDecoration &decor) MaterialDecoration &MaterialAnimator::Decoration::decor() const { - DENG2_ASSERT(d->matDecor); + DE_ASSERT(d->matDecor); return *d->matDecor; } @@ -268,7 +268,7 @@ static ClientTexture *findTextureForAnimationStage(world::TextureMaterialLayer:: return nullptr; } -DENG2_PIMPL(MaterialAnimator) +DE_PIMPL(MaterialAnimator) { ClientMaterial *material = nullptr; ///< Material to animate (not owned). MaterialVariantSpec const *spec = nullptr; ///< Variant specification. @@ -645,13 +645,13 @@ MaterialAnimator::MaterialAnimator(ClientMaterial &material, MaterialVariantSpec ClientMaterial &MaterialAnimator::material() const { - DENG2_ASSERT(d->material); + DE_ASSERT(d->material); return *d->material; } MaterialVariantSpec const &MaterialAnimator::variantSpec() const { - DENG2_ASSERT(d->spec); + DE_ASSERT(d->spec); return *d->spec; } @@ -702,7 +702,7 @@ void MaterialAnimator::animate(timespan_t /*ticLength*/) if (decorationStageChanged) { // Notify interested parties. - DENG2_FOR_AUDIENCE(DecorationStageChange, i) i->materialAnimatorDecorationStageChanged(*this); + DE_FOR_AUDIENCE(DecorationStageChange, i) i->materialAnimatorDecorationStageChanged(*this); } } diff --git a/doomsday/apps/client/src/resource/texturevariant.cpp b/doomsday/apps/client/src/resource/texturevariant.cpp index 1d4b009bd3..c760678ab9 100644 --- a/doomsday/apps/client/src/resource/texturevariant.cpp +++ b/doomsday/apps/client/src/resource/texturevariant.cpp @@ -153,14 +153,14 @@ bool TextureVariantSpec::operator == (TextureVariantSpec const &other) const case TST_GENERAL: return variant == other.variant; case TST_DETAIL: return detailVariant == other.detailVariant; } - DENG2_ASSERT(false); + DE_ASSERT(false); return false; } static String nameForGLTextureWrapMode(int mode) { if(mode == GL_REPEAT) return "repeat"; -#if defined (DENG_OPENGL) +#if defined (DE_OPENGL) if(mode == GL_CLAMP) return "clamp"; #endif if(mode == GL_CLAMP_TO_EDGE) return "clamp_edge"; @@ -205,7 +205,7 @@ String TextureVariantSpec::asText() const case TST_GENERAL: { variantspecification_t const &spec = variant; texturevariantusagecontext_t tc = spec.context; - DENG2_ASSERT(tc == TC_UNKNOWN || VALID_TEXTUREVARIANTUSAGECONTEXT(tc)); + DE_ASSERT(tc == TC_UNKNOWN || VALID_TEXTUREVARIANTUSAGECONTEXT(tc)); int glMinFilterNameIdx; if(spec.minFilter >= 0) // Constant logical value. @@ -263,7 +263,7 @@ String TextureVariantSpec::asText() const return text; } -DENG2_PIMPL(ClientTexture::Variant) +DE_PIMPL(ClientTexture::Variant) { ClientTexture &texture; /// The base for which "this" is a context derivative. TextureVariantSpec spec; /// Usage context specification. diff --git a/doomsday/apps/client/src/sys_system.cpp b/doomsday/apps/client/src/sys_system.cpp index b34c455d15..a1eec5edd0 100644 --- a/doomsday/apps/client/src/sys_system.cpp +++ b/doomsday/apps/client/src/sys_system.cpp @@ -54,12 +54,12 @@ #include "api_base.h" #if defined(WIN32) && !defined(_DEBUG) -# define DENG_CATCH_SIGNALS +# define DE_CATCH_SIGNALS #endif int novideo; // if true, stay in text mode for debugging -#ifdef DENG_CATCH_SIGNALS +#ifdef DE_CATCH_SIGNALS /** * Borrowed from Lee Killough. */ @@ -89,7 +89,7 @@ void Sys_Init() App_AudioSystem().initPlayback(); -#ifdef DENG_CATCH_SIGNALS +#ifdef DE_CATCH_SIGNALS // Register handler for abnormal situations (in release build). signal(SIGSEGV, handler); signal(SIGTERM, handler); @@ -239,7 +239,7 @@ void Sys_HideMouseCursor() * Called when Doomsday should quit (will be deferred until convenient). */ #undef Sys_Quit -DENG_EXTERN_C void Sys_Quit(void) +DE_EXTERN_C void Sys_Quit(void) { auto &app = DoomsdayApp::app(); @@ -267,12 +267,12 @@ DENG_EXTERN_C void Sys_Quit(void) if (ClientWindow::mainExists()) { ClientWindow::main().fadeContent(ClientWindow::FadeToBlack, 0.1); - de::Loop::get().timer(0.1, [] () { DENG2_APP->stopLoop(DD_GameLoopExitCode()); }); + de::Loop::get().timer(0.1, [] () { DE_APP->stopLoop(DD_GameLoopExitCode()); }); } else #endif { // It's time to stop the main loop. - DENG2_APP->stopLoop(DD_GameLoopExitCode()); + DE_APP->stopLoop(DD_GameLoopExitCode()); } } diff --git a/doomsday/apps/client/src/ui/alertmask.cpp b/doomsday/apps/client/src/ui/alertmask.cpp index 07ce7803db..f07aea4d59 100644 --- a/doomsday/apps/client/src/ui/alertmask.cpp +++ b/doomsday/apps/client/src/ui/alertmask.cpp @@ -23,8 +23,8 @@ using namespace de; -DENG2_PIMPL_NOREF(AlertMask) -, DENG2_OBSERVES(Variable, Change) +DE_PIMPL_NOREF(AlertMask) +, DE_OBSERVES(Variable, Change) { duint32 mask[LogEntry::HighestLogLevel + 1]; diff --git a/doomsday/apps/client/src/ui/axisinputcontrol.cpp b/doomsday/apps/client/src/ui/axisinputcontrol.cpp index 492a1806c2..df3da4432c 100644 --- a/doomsday/apps/client/src/ui/axisinputcontrol.cpp +++ b/doomsday/apps/client/src/ui/axisinputcontrol.cpp @@ -30,7 +30,7 @@ using namespace de; static dfloat const AXIS_NORMALIZE = 1.f / float(IJOY_AXISMAX); // Normalize from SDL's range -DENG2_PIMPL_NOREF(AxisInputControl) +DE_PIMPL_NOREF(AxisInputControl) { Type type = Pointer; dint flags = 0; @@ -62,7 +62,7 @@ DENG2_PIMPL_NOREF(AxisInputControl) #if 0 static float filter(int grade, float *accumulation, float ticLength) { - DENG2_ASSERT(accumulation); + DE_ASSERT(accumulation); int dir = de::sign(*accumulation); float avail = fabs(*accumulation); // Determine the target velocity. @@ -110,32 +110,32 @@ AxisInputControl::~AxisInputControl() AxisInputControl::Type AxisInputControl::type() const { - DENG2_GUARD(this); + DE_GUARD(this); return d->type; } void AxisInputControl::setRawInput(bool yes) { - DENG2_GUARD(this); + DE_GUARD(this); if (yes) d->flags |= IDA_RAW; else d->flags &= ~IDA_RAW; } bool AxisInputControl::isActive() const { - DENG2_GUARD(this); + DE_GUARD(this); return (d->flags & IDA_DISABLED) == 0; } bool AxisInputControl::isInverted() const { - DENG2_GUARD(this); + DE_GUARD(this); return (d->flags & IDA_INVERT) != 0; } void AxisInputControl::update(timespan_t ticLength) { - DENG2_GUARD(this); + DE_GUARD(this); Smoother_Advance(d->smoother, ticLength); @@ -176,13 +176,13 @@ void AxisInputControl::update(timespan_t ticLength) ddouble AxisInputControl::position() const { - DENG2_GUARD(this); + DE_GUARD(this); return d->position; } void AxisInputControl::setPosition(ddouble newPosition) { - DENG2_GUARD(this); + DE_GUARD(this); d->position = newPosition; } @@ -198,7 +198,7 @@ ddouble AxisInputControl::markedPosition() const void AxisInputControl::applyRealPosition(dfloat pos) { - DENG2_GUARD(this); + DE_GUARD(this); dfloat const oldRealPos = d->realPosition; dfloat const transformed = translateRealPosition(pos); @@ -227,7 +227,7 @@ void AxisInputControl::applyRealPosition(dfloat pos) dfloat AxisInputControl::translateRealPosition(dfloat realPos) const { - DENG2_GUARD(this); + DE_GUARD(this); // An inactive axis is always zero. if (!isActive()) return 0; @@ -261,49 +261,49 @@ dfloat AxisInputControl::translateRealPosition(dfloat realPos) const dfloat AxisInputControl::deadZone() const { - DENG2_GUARD(this); + DE_GUARD(this); return d->deadZone; } void AxisInputControl::setDeadZone(dfloat newDeadZone) { - DENG2_GUARD(this); + DE_GUARD(this); d->deadZone = newDeadZone; } dfloat AxisInputControl::scale() const { - DENG2_GUARD(this); + DE_GUARD(this); return d->scale; } void AxisInputControl::setScale(dfloat newScale) { - DENG2_GUARD(this); + DE_GUARD(this); d->scale = newScale; } dfloat AxisInputControl::offset() const { - DENG2_GUARD(this); + DE_GUARD(this); return d->offset; } void AxisInputControl::setOffset(dfloat newOffset) { - DENG2_GUARD(this); + DE_GUARD(this); d->offset = newOffset; } duint AxisInputControl::time() const { - DENG2_GUARD(this); + DE_GUARD(this); return d->time; } String AxisInputControl::description() const { - DENG2_GUARD(this); + DE_GUARD(this); QStringList flags; if (!isActive()) flags << "disabled"; @@ -333,13 +333,13 @@ String AxisInputControl::description() const bool AxisInputControl::inDefaultState() const { - DENG2_GUARD(this); + DE_GUARD(this); return d->position == 0; // Centered? } void AxisInputControl::reset() { - DENG2_GUARD(this); + DE_GUARD(this); if (d->type == Pointer) { // Clear the accumulation. @@ -352,9 +352,9 @@ void AxisInputControl::reset() void AxisInputControl::consoleRegister() { - DENG2_GUARD(this); + DE_GUARD(this); - DENG2_ASSERT(hasDevice() && !name().isEmpty()); + DE_ASSERT(hasDevice() && !name().isEmpty()); String controlName = String("input-%1-%2").arg(device().name()).arg(name()); Block scale = (controlName + "-factor").toUtf8(); diff --git a/doomsday/apps/client/src/ui/b_util.cpp b/doomsday/apps/client/src/ui/b_util.cpp index e3f3c4cf24..dea1438f9c 100644 --- a/doomsday/apps/client/src/ui/b_util.cpp +++ b/doomsday/apps/client/src/ui/b_util.cpp @@ -42,7 +42,7 @@ static float STAGE_FACTOR = .5f; bool B_ParseButtonState(Binding::ControlTest &test, char const *toggleName) { - DENG2_ASSERT(toggleName); + DE_ASSERT(toggleName); if (!qstrlen(toggleName) || !qstricmp(toggleName, "down")) { @@ -76,7 +76,7 @@ bool B_ParseButtonState(Binding::ControlTest &test, char const *toggleName) bool B_ParseAxisPosition(Binding::ControlTest &test, float &pos, char const *desc) { - DENG2_ASSERT(desc); + DE_ASSERT(desc); if (!qstrnicmp(desc, "within", 6) && qstrlen(desc) > 6) { @@ -109,14 +109,14 @@ bool B_ParseAxisPosition(Binding::ControlTest &test, float &pos, char const *des bool B_ParseModifierId(int &id, char const *desc) { - DENG2_ASSERT(desc); + DE_ASSERT(desc); id = String(desc).toInt() - 1 + CTL_MODIFIER_1; return (id >= CTL_MODIFIER_1 && id <= CTL_MODIFIER_4); } bool B_ParseKeyId(int &id, char const *desc) { - DENG2_ASSERT(desc); + DE_ASSERT(desc); LOG_AS("B_ParseKeyId"); // The possibilies: symbolic key name, or "codeNNN". @@ -147,7 +147,7 @@ bool B_ParseKeyId(int &id, char const *desc) bool B_ParseMouseTypeAndId(ddeventtype_t &type, int &id, char const *desc) { - DENG2_ASSERT(desc); + DE_ASSERT(desc); InputDevice const &mouse = InputSystem::get().device(IDEV_MOUSE); // Maybe it's one of the named buttons? @@ -181,7 +181,7 @@ bool B_ParseMouseTypeAndId(ddeventtype_t &type, int &id, char const *desc) bool B_ParseDeviceAxisTypeAndId(ddeventtype_t &type, int &id, InputDevice const &device, char const *desc) { - DENG2_ASSERT(desc); + DE_ASSERT(desc); type = E_AXIS; id = device.toAxisId(desc); @@ -228,7 +228,7 @@ bool B_ParseJoystickTypeAndId(ddeventtype_t &type, int &id, int deviceId, char c bool B_ParseHatAngle(float &pos, char const *desc) { - DENG2_ASSERT(desc); + DE_ASSERT(desc); if (!qstricmp(desc, "center")) { pos = -1; @@ -245,7 +245,7 @@ bool B_ParseHatAngle(float &pos, char const *desc) bool B_ParseBindingCondition(Record &cond, char const *desc) { - DENG2_ASSERT(desc); + DE_ASSERT(desc); // First, we expect to encounter a device name. AutoStr *str = AutoStr_NewStd(); @@ -429,7 +429,7 @@ bool B_CheckAxisPosition(Binding::ControlTest test, float testPos, float pos) bool B_CheckCondition(Binding::CompiledConditionRecord const *condRec, int localNum, BindContext const *context) { - DENG2_ASSERT(condRec); + DE_ASSERT(condRec); auto const &cond = condRec->compiled(); bool const fulfilled = !cond.negate; @@ -481,7 +481,7 @@ bool B_CheckCondition(Binding::CompiledConditionRecord const *condRec, int local } break; - default: DENG2_ASSERT_FAIL("B_CheckCondition: Unknown cond.type"); break; + default: DE_ASSERT_FAIL("B_CheckCondition: Unknown cond.type"); break; } return !fulfilled; @@ -491,8 +491,8 @@ bool B_CheckCondition(Binding::CompiledConditionRecord const *condRec, int local void B_EvaluateImpulseBindings(BindContext const *context, int localNum, int impulseId, float *pos, float *relativeOffset, bool allowTriggered) { - DENG2_ASSERT(context); // Why call without one? - DENG2_ASSERT(pos && relativeOffset); + DE_ASSERT(context); // Why call without one? + DE_ASSERT(pos && relativeOffset); *pos = 0; *relativeOffset = 0; @@ -513,7 +513,7 @@ void B_EvaluateImpulseBindings(BindContext const *context, int localNum, int imp // If the binding has conditions, they may prevent using it. bool skip = false; ArrayValue const &conds = rec.geta(QStringLiteral("condition")); - DENG2_FOR_EACH_CONST(ArrayValue::Elements, i, conds.elements()) + DE_FOR_EACH_CONST(ArrayValue::Elements, i, conds.elements()) { if (!B_CheckCondition(static_cast ((*i)->as().record()), localNum, context)) @@ -537,7 +537,7 @@ void B_EvaluateImpulseBindings(BindContext const *context, int localNum, int imp case IBD_TOGGLE: ctrl = &device->button(bind.controlId); break; case IBD_ANGLE: ctrl = &device->hat (bind.controlId); break; - default: DENG2_ASSERT_FAIL("B_EvaluateImpulseBindings: Invalid bind.type"); break; + default: DE_ASSERT_FAIL("B_EvaluateImpulseBindings: Invalid bind.type"); break; } float devicePos = 0; @@ -666,7 +666,7 @@ String B_ControlDescToString(int deviceId, ddeventtype_t type, int id) switch (type) { case E_TOGGLE: { - DENG2_ASSERT(device); + DE_ASSERT(device); ButtonInputControl &button = device->button(id); if (!button.name().isEmpty()) { @@ -691,14 +691,14 @@ String B_ControlDescToString(int deviceId, ddeventtype_t type, int id) break; } case E_AXIS: - DENG2_ASSERT(device); + DE_ASSERT(device); str += device->axis(id).name(); break; case E_ANGLE: str += "hat" + String::number(id + 1); break; case E_SYMBOLIC: str += "sym"; break; - default: DENG2_ASSERT_FAIL("B_ControlDescToString: Invalid event type"); break; + default: DE_ASSERT_FAIL("B_ControlDescToString: Invalid event type"); break; } return str; @@ -715,7 +715,7 @@ String B_ButtonStateToString(Binding::ControlTest test) case Binding::ButtonStateUp: return "-up"; default: - DENG2_ASSERT_FAIL("B_ButtonStateToString: Unknown test"); + DE_ASSERT_FAIL("B_ButtonStateToString: Unknown test"); return ""; } } @@ -730,7 +730,7 @@ String B_AxisPositionToString(Binding::ControlTest test, float pos) case Binding::AxisPositionBeyondNegative: return String("-neg%1").arg(-pos); default: - DENG2_ASSERT_FAIL("B_AxisPositionToString: Unknown test"); + DE_ASSERT_FAIL("B_AxisPositionToString: Unknown test"); return ""; } } @@ -929,7 +929,7 @@ char const *B_ShortNameForKey(int ddKey, bool forceLowercase) int B_KeyForShortName(char const *key) { - DENG2_ASSERT(key); + DE_ASSERT(key); for (uint idx = 0; keyNames[idx].key; ++idx) { diff --git a/doomsday/apps/client/src/ui/bindcontext.cpp b/doomsday/apps/client/src/ui/bindcontext.cpp index 31ce0d968d..980ecb82d4 100644 --- a/doomsday/apps/client/src/ui/bindcontext.cpp +++ b/doomsday/apps/client/src/ui/bindcontext.cpp @@ -41,7 +41,7 @@ static String const VAR_TEST ("test"); static String const VAR_DEVICE_ID ("deviceId"); static String const VAR_CONTROL_ID("controlId"); -DENG2_PIMPL(BindContext) +DE_PIMPL(BindContext) { bool active = false; ///< @c true= Bindings are active. bool protect = false; ///< @c true= Prevent explicit end user (de)activation. @@ -77,7 +77,7 @@ DENG2_PIMPL(BindContext) bool findMatchingBinding(Record const *matchCmdRec, Record const *matchImpRec, Record **cmdResult, Record **impResult) const { - DENG2_ASSERT(cmdResult && impResult); + DE_ASSERT(cmdResult && impResult); *cmdResult = nullptr; *impResult = nullptr; @@ -178,14 +178,14 @@ DENG2_PIMPL(BindContext) } } - DENG2_PIMPL_AUDIENCE(ActiveChange) - DENG2_PIMPL_AUDIENCE(AcquireDeviceChange) - DENG2_PIMPL_AUDIENCE(BindingAddition) + DE_PIMPL_AUDIENCE(ActiveChange) + DE_PIMPL_AUDIENCE(AcquireDeviceChange) + DE_PIMPL_AUDIENCE(BindingAddition) }; -DENG2_AUDIENCE_METHOD(BindContext, ActiveChange) -DENG2_AUDIENCE_METHOD(BindContext, AcquireDeviceChange) -DENG2_AUDIENCE_METHOD(BindContext, BindingAddition) +DE_AUDIENCE_METHOD(BindContext, ActiveChange) +DE_AUDIENCE_METHOD(BindContext, AcquireDeviceChange) +DE_AUDIENCE_METHOD(BindContext, BindingAddition) BindContext::BindContext(String const &name) : d(new Impl(this)) { @@ -231,12 +231,12 @@ void BindContext::activate(bool yes) d->active = yes; // Notify interested parties. - DENG2_FOR_AUDIENCE2(ActiveChange, i) i->bindContextActiveChanged(*this); + DE_FOR_AUDIENCE2(ActiveChange, i) i->bindContextActiveChanged(*this); } void BindContext::acquire(int deviceId, bool yes) { - DENG2_ASSERT(deviceId >= 0 && deviceId < NUM_INPUT_DEVICES); + DE_ASSERT(deviceId >= 0 && deviceId < NUM_INPUT_DEVICES); int const countBefore = d->acquireDevices.count(); if (yes) d->acquireDevices.insert(deviceId); @@ -245,7 +245,7 @@ void BindContext::acquire(int deviceId, bool yes) if (countBefore != d->acquireDevices.count()) { // Notify interested parties. - DENG2_FOR_AUDIENCE2(AcquireDeviceChange, i) i->bindContextAcquireDeviceChanged(*this); + DE_FOR_AUDIENCE2(AcquireDeviceChange, i) i->bindContextAcquireDeviceChanged(*this); } } @@ -256,7 +256,7 @@ void BindContext::acquireAll(bool yes) d->acquireAllDevices = yes; // Notify interested parties. - DENG2_FOR_AUDIENCE2(AcquireDeviceChange, i) i->bindContextAcquireDeviceChanged(*this); + DE_FOR_AUDIENCE2(AcquireDeviceChange, i) i->bindContextAcquireDeviceChanged(*this); } } @@ -322,7 +322,7 @@ void BindContext::clearBindingsForDevice(int deviceId) Record *BindContext::bindCommand(char const *eventDesc, char const *command) { - DENG2_ASSERT(eventDesc && command && command[0]); + DE_ASSERT(eventDesc && command && command[0]); LOG_AS("BindContext"); try { @@ -341,7 +341,7 @@ Record *BindContext::bindCommand(char const *eventDesc, char const *command) d->deleteMatching(&bind.def(), nullptr); // Notify interested parties. - DENG2_FOR_AUDIENCE2(BindingAddition, i) i->bindContextBindingAdded(*this, bind.def(), true/*is-command*/); + DE_FOR_AUDIENCE2(BindingAddition, i) i->bindContextBindingAdded(*this, bind.def(), true/*is-command*/); Con_MarkAsChanged(true); @@ -354,8 +354,8 @@ Record *BindContext::bindCommand(char const *eventDesc, char const *command) Record *BindContext::bindImpulse(char const *ctrlDesc, PlayerImpulse const &impulse, int localPlayer) { - DENG2_ASSERT(ctrlDesc); - DENG2_ASSERT(localPlayer >= 0 && localPlayer < DDMAXPLAYERS); + DE_ASSERT(ctrlDesc); + DE_ASSERT(localPlayer >= 0 && localPlayer < DDMAXPLAYERS); LOG_AS("BindContext"); try { @@ -375,7 +375,7 @@ Record *BindContext::bindImpulse(char const *ctrlDesc, PlayerImpulse const &impu d->deleteMatching(nullptr, &bind.def()); // Notify interested parties. - DENG2_FOR_AUDIENCE2(BindingAddition, i) i->bindContextBindingAdded(*this, bind.def(), false/*is-impulse*/); + DE_FOR_AUDIENCE2(BindingAddition, i) i->bindContextBindingAdded(*this, bind.def(), false/*is-impulse*/); Con_MarkAsChanged(true); diff --git a/doomsday/apps/client/src/ui/binding.cpp b/doomsday/apps/client/src/ui/binding.cpp index 948e98a3d3..89e5b74c0e 100644 --- a/doomsday/apps/client/src/ui/binding.cpp +++ b/doomsday/apps/client/src/ui/binding.cpp @@ -94,13 +94,13 @@ bool Binding::equalConditions(Binding const &other) const } ArrayValue const &conds = def().geta(VAR_CONDITION); - DENG2_FOR_EACH_CONST(ArrayValue::Elements, i, conds.elements()) + DE_FOR_EACH_CONST(ArrayValue::Elements, i, conds.elements()) { auto const &a = *static_cast((*i)->as().record()); bool found = false; ArrayValue const &conds2 = other.geta(VAR_CONDITION); - DENG2_FOR_EACH_CONST(ArrayValue::Elements, i, conds2.elements()) + DE_FOR_EACH_CONST(ArrayValue::Elements, i, conds2.elements()) { auto const &b = *static_cast((*i)->as().record()); if (a.compiled() == b.compiled()) diff --git a/doomsday/apps/client/src/ui/busyvisual.cpp b/doomsday/apps/client/src/ui/busyvisual.cpp index 8991289a23..4b2e3e9c4e 100644 --- a/doomsday/apps/client/src/ui/busyvisual.cpp +++ b/doomsday/apps/client/src/ui/busyvisual.cpp @@ -154,15 +154,15 @@ void Con_DrawTransition(void) if (isDedicated) return; if (!Con_TransitionInProgress()) return; - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); DGL_MatrixMode(DGL_PROJECTION); DGL_PushMatrix(); DGL_LoadIdentity(); DGL_Ortho(0, 0, SCREENWIDTH, SCREENHEIGHT, -1, 1); - DENG2_ASSERT(ClientWindow::main().busy().transitionFrame() != 0); + DE_ASSERT(ClientWindow::main().busy().transitionFrame() != 0); GLuint const texScreenshot = ClientWindow::main().busy().transitionFrame()->glName(); diff --git a/doomsday/apps/client/src/ui/clientrootwidget.cpp b/doomsday/apps/client/src/ui/clientrootwidget.cpp index 7641428e1d..9f121e33d2 100644 --- a/doomsday/apps/client/src/ui/clientrootwidget.cpp +++ b/doomsday/apps/client/src/ui/clientrootwidget.cpp @@ -24,7 +24,7 @@ using namespace de; -DENG2_PIMPL_NOREF(ClientRootWidget) +DE_PIMPL_NOREF(ClientRootWidget) { PackageIconBank packageIconBank; }; diff --git a/doomsday/apps/client/src/ui/clientstyle.cpp b/doomsday/apps/client/src/ui/clientstyle.cpp index 4e616362c9..cd9dddb1e1 100644 --- a/doomsday/apps/client/src/ui/clientstyle.cpp +++ b/doomsday/apps/client/src/ui/clientstyle.cpp @@ -24,7 +24,7 @@ using namespace de; -DENG2_PIMPL_NOREF(ClientStyle) +DE_PIMPL_NOREF(ClientStyle) { struct EmptyMenuLabelStylist : public ui::Stylist { diff --git a/doomsday/apps/client/src/ui/clientwindow.cpp b/doomsday/apps/client/src/ui/clientwindow.cpp index 6e94ab91fe..7f46a875ce 100644 --- a/doomsday/apps/client/src/ui/clientwindow.cpp +++ b/doomsday/apps/client/src/ui/clientwindow.cpp @@ -72,18 +72,18 @@ using namespace de; -DENG2_PIMPL(ClientWindow) -, DENG2_OBSERVES(App, StartupComplete) -, DENG2_OBSERVES(DoomsdayApp, GameChange) -, DENG2_OBSERVES(MouseEventSource, MouseStateChange) -, DENG2_OBSERVES(WindowEventHandler, FocusChange) -, DENG2_OBSERVES(GLWindow, Init) -, DENG2_OBSERVES(GLWindow, Resize) -, DENG2_OBSERVES(GLWindow, Swap) -, DENG2_OBSERVES(Variable, Change) +DE_PIMPL(ClientWindow) +, DE_OBSERVES(App, StartupComplete) +, DE_OBSERVES(DoomsdayApp, GameChange) +, DE_OBSERVES(MouseEventSource, MouseStateChange) +, DE_OBSERVES(WindowEventHandler, FocusChange) +, DE_OBSERVES(GLWindow, Init) +, DE_OBSERVES(GLWindow, Resize) +, DE_OBSERVES(GLWindow, Swap) +, DE_OBSERVES(Variable, Change) , DENG2_OBSERVES(FileSystem, Busy) -#if !defined (DENG_MOBILE) -, DENG2_OBSERVES(PersistentGLWindow, AttributeChange) +#if !defined (DE_MOBILE) +, DE_OBSERVES(PersistentGLWindow, AttributeChange) #endif { bool needMainInit = true; @@ -166,7 +166,7 @@ DENG2_PIMPL(ClientWindow) StringList configVariableNames() const { -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) return StringList() << self().configName("fsaa") << self().configName("vsync"); @@ -251,7 +251,7 @@ DENG2_PIMPL(ClientWindow) .setInput(Rule::Bottom, root.viewBottom() + *homeDelta); root.add(home); -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) // Busy progress should be visible over the Home. busy->progress().orphan(); busy->progress().rule().setRect(game->rule()); @@ -344,7 +344,7 @@ DENG2_PIMPL(ClientWindow) root.add(cursor); /* -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG auto debugPrint = [] (Widget &w) { int depth = 0; @@ -370,7 +370,7 @@ DENG2_PIMPL(ClientWindow) #endif */ -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) self().audienceForAttributeChange() += this; #endif } @@ -462,7 +462,7 @@ DENG2_PIMPL(ClientWindow) break; case Normal: -#if defined (DENG_HAVE_BUSYRUNNER) +#if defined (DE_HAVE_BUSYRUNNER) // The busy widget will hide itself after a possible transition has finished. busy->disable(); #else @@ -504,7 +504,7 @@ DENG2_PIMPL(ClientWindow) { needMainInit = false; -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) self().raise(); self().requestActivate(); #endif @@ -543,7 +543,7 @@ DENG2_PIMPL(ClientWindow) completeFade(); } -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) void windowAttributesChanged(PersistentGLWindow &) override { showOrHideQuitButton(); @@ -671,7 +671,7 @@ DENG2_PIMPL(ClientWindow) { /*#ifdef WIN32 self().updateCanvasFormat(); - DENG2_UNUSED(newValue); + DE_UNUSED(newValue); #else*/ GL_SetVSync(newValue.isTrue()); //#endif @@ -690,7 +690,7 @@ DENG2_PIMPL(ClientWindow) // Maximize game to hide the "Now playing" controls. home->moveOffscreen(1.0); - DENG2_ASSERT(sidebar == NULL); + DE_ASSERT(sidebar == NULL); // Attach the widget. switch (location) @@ -715,7 +715,7 @@ DENG2_PIMPL(ClientWindow) void uninstallSidebar(SidebarLocation location) { - DENG2_ASSERT(sidebar != NULL); + DE_ASSERT(sidebar != NULL); switch (location) { @@ -732,7 +732,7 @@ DENG2_PIMPL(ClientWindow) void updateRootSize() { - DENG_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_IN_MAIN_THREAD(); needRootSizeUpdate = false; @@ -769,7 +769,7 @@ DENG2_PIMPL(ClientWindow) void updateMouseCursor() { -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) // The cursor is only needed if the content is warped. cursor->show(!self().eventHandler().isMouseTrapped() && VRConfig::modeAppliesDisplacement(vrCfg().mode())); @@ -830,7 +830,7 @@ ClientWindow::ClientWindow(String const &id) : BaseWindow(id) , d(new Impl(this)) { -#if defined (DENG_MOBILE) +#if defined (DE_MOBILE) setMain(this); WindowSystem::get().addWindow("main", this); #endif @@ -846,7 +846,7 @@ ClientWindow::ClientWindow(String const &id) d->setupUI(); -#if defined (DENG_MOBILE) +#if defined (DE_MOBILE) // Stay out from under the virtual keyboard. connect(this, &GLWindow::rootDimensionsChanged, [this] (QRect rect) { @@ -941,7 +941,7 @@ void ClientWindow::preDraw() ClientApp::app().preFrame(); /// @todo what about multiwindow? - DENG2_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_IN_RENDER_THREAD(); LIBGUI_ASSERT_GL_CONTEXT_ACTIVE(); // Cursor position (if cursor is visible). @@ -962,13 +962,13 @@ Vec2f ClientWindow::windowContentSize() const void ClientWindow::drawWindowContent() { -#if defined (DENG_MOBILE) +#if defined (DE_MOBILE) { } #endif - DENG2_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_IN_RENDER_THREAD(); root().draw(); LIBGUI_ASSERT_GL_OK(); } @@ -976,7 +976,7 @@ void ClientWindow::drawWindowContent() void ClientWindow::postDraw() { /// @note This method is called during the GLWindow paintGL event. - DENG2_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_IN_RENDER_THREAD(); BaseWindow::postDraw(); @@ -1022,7 +1022,7 @@ bool ClientWindow::setDefaultGLFormat() // static void ClientWindow::grab(image_t &img, bool halfSized) const { - DENG_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_IN_MAIN_THREAD(); QSize outputSize = (halfSized? QSize(pixelWidth()/2, pixelHeight()/2) : QSize()); QImage grabbed = grabImage(outputSize); @@ -1038,7 +1038,7 @@ void ClientWindow::grab(image_t &img, bool halfSized) const << grabbed.width() << grabbed.height() << grabbed.byteCount() << grabbed.depth() << grabbed.format(); - DENG_ASSERT(img.pixelSize != 0); + DE_ASSERT(img.pixelSize != 0); } void ClientWindow::fadeInTaskBarBlur(TimeSpan span) @@ -1103,24 +1103,24 @@ void ClientWindow::addOnTop(GuiWidget *widget) void ClientWindow::setSidebar(SidebarLocation location, GuiWidget *sidebar) { - DENG2_ASSERT(location == RightEdge); + DE_ASSERT(location == RightEdge); d->installSidebar(location, sidebar); } bool ClientWindow::hasSidebar(SidebarLocation location) const { - DENG2_ASSERT(location == RightEdge); - DENG2_UNUSED(location); + DE_ASSERT(location == RightEdge); + DE_UNUSED(location); return d->sidebar != 0; } GuiWidget &ClientWindow::sidebar(SidebarLocation location) const { - DENG2_ASSERT(location == RightEdge); - DENG2_UNUSED(location); - DENG2_ASSERT(d->sidebar != nullptr); + DE_ASSERT(location == RightEdge); + DE_UNUSED(location); + DE_ASSERT(d->sidebar != nullptr); return *d->sidebar; } @@ -1141,7 +1141,7 @@ FadeToBlackWidget *ClientWindow::contentFade() } #undef M_ScreenShot -DENG_EXTERN_C int M_ScreenShot(char const *name, int flags) +DE_EXTERN_C int M_ScreenShot(char const *name, int flags) { de::String fullName(name); if(fullName.fileNameExtension().isEmpty()) diff --git a/doomsday/apps/client/src/ui/clientwindowsystem.cpp b/doomsday/apps/client/src/ui/clientwindowsystem.cpp index 074af50bf2..9b627f84db 100644 --- a/doomsday/apps/client/src/ui/clientwindowsystem.cpp +++ b/doomsday/apps/client/src/ui/clientwindowsystem.cpp @@ -27,7 +27,7 @@ using namespace de; -DENG2_PIMPL(ClientWindowSystem) +DE_PIMPL(ClientWindowSystem) { ConfigProfiles settings; diff --git a/doomsday/apps/client/src/ui/commandbinding.cpp b/doomsday/apps/client/src/ui/commandbinding.cpp index 798798aebc..3c3371e8d2 100644 --- a/doomsday/apps/client/src/ui/commandbinding.cpp +++ b/doomsday/apps/client/src/ui/commandbinding.cpp @@ -63,12 +63,12 @@ String CommandBinding::composeDescriptor() case E_ANGLE: str += B_HatAngleToString(getf("pos")); break; case E_SYMBOLIC: str += "-" + gets("symbolicName"); break; - default: DENG2_ASSERT_FAIL("CommandBinding::composeDescriptor: Unknown bind.type"); break; + default: DE_ASSERT_FAIL("CommandBinding::composeDescriptor: Unknown bind.type"); break; } // Append any state conditions. ArrayValue const &conds = def().geta("condition"); - DENG2_FOR_EACH_CONST(ArrayValue::Elements, i, conds.elements()) + DE_FOR_EACH_CONST(ArrayValue::Elements, i, conds.elements()) { str += " + " + B_ConditionToString(*(*i)->as().record()); } @@ -81,7 +81,7 @@ String CommandBinding::composeDescriptor() */ static bool doConfigure(CommandBinding &bind, char const *eventDesc, char const *command) { - DENG2_ASSERT(eventDesc); + DE_ASSERT(eventDesc); //InputSystem &isys = ClientApp::inputSystem(); bind.resetToDefaults(); @@ -150,7 +150,7 @@ static bool doConfigure(CommandBinding &bind, char const *eventDesc, char const bind.def().set("pos", pos); break; } - default: DENG2_ASSERT_FAIL("InputSystem::configure: Invalid bind.type"); break; + default: DE_ASSERT_FAIL("InputSystem::configure: Invalid bind.type"); break; } } else if (!Str_CompareIgnoreCase(str, "joy") || @@ -198,7 +198,7 @@ static bool doConfigure(CommandBinding &bind, char const *eventDesc, char const bind.def().set("pos", pos); break; } - default: DENG2_ASSERT_FAIL("InputSystem::configure: Invalid bind.type") break; + default: DE_ASSERT_FAIL("InputSystem::configure: Invalid bind.type") break; } } else if (!Str_CompareIgnoreCase(str, "sym")) @@ -229,7 +229,7 @@ static bool doConfigure(CommandBinding &bind, char const *eventDesc, char const void CommandBinding::configure(char const *eventDesc, char const *command, bool assignNewId) { - DENG2_ASSERT(eventDesc); + DE_ASSERT(eventDesc); LOG_AS("CommandBinding"); // The first part specifies the event condition. @@ -274,7 +274,7 @@ void CommandBinding::configure(char const *eventDesc, char const *command, bool */ static void substituteInCommand(String const &command, ddevent_t const &event, ddstring_t *out) { - DENG2_ASSERT(out); + DE_ASSERT(out); Block const str = command.toUtf8(); for (char const *ptr = str.constData(); *ptr; ptr++) { @@ -344,7 +344,7 @@ Action *CommandBinding::makeAction(ddevent_t const &event, BindContext const &co if (geti("controlId") != event.toggle.id) return nullptr; - DENG2_ASSERT(dev); + DE_ASSERT(dev); ButtonInputControl &button = dev->button(geti("controlId")); if (respectHigherContexts) @@ -391,7 +391,7 @@ Action *CommandBinding::makeAction(ddevent_t const &event, BindContext const &co if (geti("controlId") != event.axis.id) return nullptr; - DENG2_ASSERT(dev); + DE_ASSERT(dev); if (dev->axis(geti("controlId")).bindContext() != &context) return nullptr; // Shadowed by a more important active class. @@ -406,7 +406,7 @@ Action *CommandBinding::makeAction(ddevent_t const &event, BindContext const &co if (geti("controlId") != event.angle.id) return nullptr; - DENG2_ASSERT(dev); + DE_ASSERT(dev); if (dev->hat(geti("controlId")).bindContext() != &context) return nullptr; // Shadowed by a more important active class. @@ -425,7 +425,7 @@ Action *CommandBinding::makeAction(ddevent_t const &event, BindContext const &co // Any conditions on the current state of the input devices? ArrayValue const &conds = def().geta("condition"); - DENG2_FOR_EACH_CONST(ArrayValue::Elements, i, conds.elements()) + DE_FOR_EACH_CONST(ArrayValue::Elements, i, conds.elements()) { if (!B_CheckCondition(static_cast ((*i)->as().record()), 0, &context)) diff --git a/doomsday/apps/client/src/ui/controllerpresets.cpp b/doomsday/apps/client/src/ui/controllerpresets.cpp index 064bb57481..19a06f91d5 100644 --- a/doomsday/apps/client/src/ui/controllerpresets.cpp +++ b/doomsday/apps/client/src/ui/controllerpresets.cpp @@ -36,8 +36,8 @@ using namespace de; static String VAR_CONTROLLER_PRESETS("controllerPresets"); -DENG2_PIMPL_NOREF(ControllerPresets) -, DENG2_OBSERVES(DoomsdayApp, GameChange) +DE_PIMPL_NOREF(ControllerPresets) +, DE_OBSERVES(DoomsdayApp, GameChange) { Record &inputModule; char const *presetCVarPath = nullptr; @@ -120,7 +120,7 @@ DENG2_PIMPL_NOREF(ControllerPresets) void currentGameChanged(Game const &newGame) { - DENG2_ASSERT(deviceId == IDEV_JOY1); /// @todo Expand for other devices as needed. -jk + DE_ASSERT(deviceId == IDEV_JOY1); /// @todo Expand for other devices as needed. -jk // When loading a game, automatically apply the control scheme matching // the connected game controller (unless a specific scheme is already set). diff --git a/doomsday/apps/client/src/ui/dialogs/aboutdialog.cpp b/doomsday/apps/client/src/ui/dialogs/aboutdialog.cpp index 5e0d47db04..7db17e5da1 100644 --- a/doomsday/apps/client/src/ui/dialogs/aboutdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/aboutdialog.cpp @@ -34,7 +34,7 @@ using namespace de; -DENG2_PIMPL(AboutDialog) +DE_PIMPL(AboutDialog) { DocumentPopupWidget *glPopup; DocumentPopupWidget *audioPopup; diff --git a/doomsday/apps/client/src/ui/dialogs/alertdialog.cpp b/doomsday/apps/client/src/ui/dialogs/alertdialog.cpp index f9d4c0b7be..053f338e26 100644 --- a/doomsday/apps/client/src/ui/dialogs/alertdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/alertdialog.cpp @@ -39,10 +39,10 @@ using namespace de; static String const VAR_AUTOHIDE = "alert.autoHide"; -DENG_GUI_PIMPL(AlertDialog) -, DENG2_OBSERVES(ChildWidgetOrganizer, WidgetCreation) -, DENG2_OBSERVES(ChildWidgetOrganizer, WidgetUpdate) -, DENG2_OBSERVES(Variable, Change) +DE_GUI_PIMPL(AlertDialog) +, DE_OBSERVES(ChildWidgetOrganizer, WidgetCreation) +, DE_OBSERVES(ChildWidgetOrganizer, WidgetUpdate) +, DE_OBSERVES(Variable, Change) { /// Data model item representing an alert in the list. class AlertItem : public ui::ActionItem @@ -180,7 +180,7 @@ DENG_GUI_PIMPL(AlertDialog) void add(AlertItem *alert) { - DENG2_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_IN_MAIN_THREAD(); // If we already have this, don't re-add. for (ui::Data::Pos i = 0; i < alerts->items().size(); ++i) @@ -236,8 +236,8 @@ DENG_GUI_PIMPL(AlertDialog) void widgetUpdatedForItem(GuiWidget &widget, ui::Item const &item) { - DENG2_UNUSED(widget); - DENG2_UNUSED(item); + DE_UNUSED(widget); + DE_UNUSED(item); } void showNotification() diff --git a/doomsday/apps/client/src/ui/dialogs/audiosettingsdialog.cpp b/doomsday/apps/client/src/ui/dialogs/audiosettingsdialog.cpp index d47931a981..883c75ffb0 100644 --- a/doomsday/apps/client/src/ui/dialogs/audiosettingsdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/audiosettingsdialog.cpp @@ -42,7 +42,7 @@ using namespace de; using namespace de::ui; -DENG_GUI_PIMPL(AudioSettingsDialog) +DE_GUI_PIMPL(AudioSettingsDialog) { CVarSliderWidget *sfxVolume; CVarSliderWidget *musicVolume; @@ -155,7 +155,7 @@ DENG_GUI_PIMPL(AudioSettingsDialog) soundPlugin->items() << new ChoiceItem(tr("FMOD"), "fmod") - #if !defined (DENG_DISABLE_SDLMIXER) + #if !defined (DE_DISABLE_SDLMIXER) << new ChoiceItem(tr("SDL_mixer"), "sdlmixer") #endif << new ChoiceItem(tr("OpenAL"), "openal") @@ -167,7 +167,7 @@ DENG_GUI_PIMPL(AudioSettingsDialog) musicPlugin->items() << new ChoiceItem(tr("Fluidsynth"), "fluidsynth") << new ChoiceItem(tr("FMOD"), "fmod") - #if !defined (DENG_DISABLE_SDLMIXER) + #if !defined (DE_DISABLE_SDLMIXER) << new ChoiceItem(tr("SDL_mixer"), "sdlmixer") #endif #if defined (WIN32) diff --git a/doomsday/apps/client/src/ui/dialogs/coloradjustmentdialog.cpp b/doomsday/apps/client/src/ui/dialogs/coloradjustmentdialog.cpp index 1a607da849..b2289a0808 100644 --- a/doomsday/apps/client/src/ui/dialogs/coloradjustmentdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/coloradjustmentdialog.cpp @@ -25,7 +25,7 @@ using namespace de; using namespace de::ui; -DENG_GUI_PIMPL(ColorAdjustmentDialog) +DE_GUI_PIMPL(ColorAdjustmentDialog) { CVarSliderWidget *gamma; CVarSliderWidget *contrast; diff --git a/doomsday/apps/client/src/ui/dialogs/createprofiledialog.cpp b/doomsday/apps/client/src/ui/dialogs/createprofiledialog.cpp index 43a3dc0395..68b452e14a 100644 --- a/doomsday/apps/client/src/ui/dialogs/createprofiledialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/createprofiledialog.cpp @@ -40,7 +40,7 @@ using namespace de; -DENG_GUI_PIMPL(CreateProfileDialog) +DE_GUI_PIMPL(CreateProfileDialog) , DENG2_OBSERVES(ToggleWidget, Toggle) , DENG2_OBSERVES(SliderWidget, Change) { diff --git a/doomsday/apps/client/src/ui/dialogs/datafilesettingsdialog.cpp b/doomsday/apps/client/src/ui/dialogs/datafilesettingsdialog.cpp index 7491a8efc9..7cffe51cac 100644 --- a/doomsday/apps/client/src/ui/dialogs/datafilesettingsdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/datafilesettingsdialog.cpp @@ -27,7 +27,7 @@ using namespace de; -DENG2_PIMPL_NOREF(DataFileSettingsDialog) +DE_PIMPL_NOREF(DataFileSettingsDialog) { Variable &pkgFolders = Config::get("resource.packageFolder"); Id searchGroup; diff --git a/doomsday/apps/client/src/ui/dialogs/downloaddialog.cpp b/doomsday/apps/client/src/ui/dialogs/downloaddialog.cpp index e6ab644d47..6961ceba74 100644 --- a/doomsday/apps/client/src/ui/dialogs/downloaddialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/downloaddialog.cpp @@ -24,7 +24,7 @@ using namespace de; -DENG_GUI_PIMPL(DownloadDialog) +DE_GUI_PIMPL(DownloadDialog) { ProgressWidget *progress; diff --git a/doomsday/apps/client/src/ui/dialogs/filedownloaddialog.cpp b/doomsday/apps/client/src/ui/dialogs/filedownloaddialog.cpp index 0d19eb1630..4377756362 100644 --- a/doomsday/apps/client/src/ui/dialogs/filedownloaddialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/filedownloaddialog.cpp @@ -23,8 +23,8 @@ using namespace de; -DENG_GUI_PIMPL(FileDownloadDialog) -, DENG2_OBSERVES(shell::PackageDownloader, Status) +DE_GUI_PIMPL(FileDownloadDialog) +, DE_OBSERVES(shell::PackageDownloader, Status) { shell::PackageDownloader &downloader; String message = tr("Downloading data files..."); @@ -36,8 +36,8 @@ DENG_GUI_PIMPL(FileDownloadDialog) downloader.audienceForStatus() += this; self().progressIndicator().setText(tr("%1\n" _E(l)_E(F) "%2" - DENG2_CHAR_MDASH " files / " - DENG2_CHAR_MDASH " MB") + DE_CHAR_MDASH " files / " + DE_CHAR_MDASH " MB") .arg(message) .arg(_E(l))); } @@ -52,7 +52,7 @@ DENG_GUI_PIMPL(FileDownloadDialog) indicator.setText(tr("%1\n" _E(l)_E(F) "%2 file%3 / %4 MB") .arg(message) .arg(files.start) - .arg(DENG2_PLURAL_S(files.start)) + .arg(DE_PLURAL_S(files.start)) .arg(bytes.start/1.0e6, 0, 'f', 1)); } }; diff --git a/doomsday/apps/client/src/ui/dialogs/inputsettingsdialog.cpp b/doomsday/apps/client/src/ui/dialogs/inputsettingsdialog.cpp index 42fbc1abe4..eacb40c730 100644 --- a/doomsday/apps/client/src/ui/dialogs/inputsettingsdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/inputsettingsdialog.cpp @@ -34,7 +34,7 @@ using namespace de; using namespace de::ui; -DENG_GUI_PIMPL(InputSettingsDialog) +DE_GUI_PIMPL(InputSettingsDialog) { ChoiceWidget *gamepad; ButtonWidget *applyGamepad; diff --git a/doomsday/apps/client/src/ui/dialogs/logsettingsdialog.cpp b/doomsday/apps/client/src/ui/dialogs/logsettingsdialog.cpp index 92a93c0d08..e54d5134a3 100644 --- a/doomsday/apps/client/src/ui/dialogs/logsettingsdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/logsettingsdialog.cpp @@ -46,8 +46,8 @@ static DomainText const domainText[] = { #define NUM_DOMAINS (sizeof(domainText)/sizeof(domainText[0])) -DENG2_PIMPL(LogSettingsDialog) -, DENG2_OBSERVES(ToggleWidget, Toggle) +DE_PIMPL(LogSettingsDialog) +, DE_OBSERVES(ToggleWidget, Toggle) { ui::ListData levels; VariableToggleWidget *separately; diff --git a/doomsday/apps/client/src/ui/dialogs/manualconnectiondialog.cpp b/doomsday/apps/client/src/ui/dialogs/manualconnectiondialog.cpp index 1f343e61d6..8c7e8f80b5 100644 --- a/doomsday/apps/client/src/ui/dialogs/manualconnectiondialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/manualconnectiondialog.cpp @@ -29,9 +29,9 @@ using namespace de; -DENG2_PIMPL(ManualConnectionDialog) -, DENG2_OBSERVES(ServerLink, DiscoveryUpdate) -, DENG2_OBSERVES(MultiplayerServerMenuWidget, AboutToJoin) +DE_PIMPL(ManualConnectionDialog) +, DE_OBSERVES(ServerLink, DiscoveryUpdate) +, DE_OBSERVES(MultiplayerServerMenuWidget, AboutToJoin) { String usedAddress; FoldPanelWidget *fold; diff --git a/doomsday/apps/client/src/ui/dialogs/networksettingsdialog.cpp b/doomsday/apps/client/src/ui/dialogs/networksettingsdialog.cpp index 3b164bb369..98132cd297 100644 --- a/doomsday/apps/client/src/ui/dialogs/networksettingsdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/networksettingsdialog.cpp @@ -33,7 +33,7 @@ using namespace de; using namespace de::ui; -DENG_GUI_PIMPL(NetworkSettingsDialog) +DE_GUI_PIMPL(NetworkSettingsDialog) { VariableToggleWidget *localPackages; VariableLineEditWidget *webApiUrl; diff --git a/doomsday/apps/client/src/ui/dialogs/packagecompatibilitydialog.cpp b/doomsday/apps/client/src/ui/dialogs/packagecompatibilitydialog.cpp index 060bfc121e..e9c7a807b5 100644 --- a/doomsday/apps/client/src/ui/dialogs/packagecompatibilitydialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/packagecompatibilitydialog.cpp @@ -33,7 +33,7 @@ using namespace de; -DENG2_PIMPL(PackageCompatibilityDialog) +DE_PIMPL(PackageCompatibilityDialog) { String message; StringList wanted; @@ -352,7 +352,7 @@ void PackageCompatibilityDialog::setMessage(String const &msg) void PackageCompatibilityDialog::setWantedPackages(StringList packages) { - DENG2_ASSERT(!packages.isEmpty()); + DE_ASSERT(!packages.isEmpty()); d->wanted = packages; d->update(); diff --git a/doomsday/apps/client/src/ui/dialogs/packageinfodialog.cpp b/doomsday/apps/client/src/ui/dialogs/packageinfodialog.cpp index f26f45ddb6..5707b3a2f4 100644 --- a/doomsday/apps/client/src/ui/dialogs/packageinfodialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/packageinfodialog.cpp @@ -49,7 +49,7 @@ using namespace de; -DENG_GUI_PIMPL(PackageInfoDialog) +DE_GUI_PIMPL(PackageInfoDialog) { Mode mode; LabelWidget * title; @@ -337,6 +337,7 @@ DENG_GUI_PIMPL(PackageInfoDialog) int const mapCount = bundle->lumpDirectory()->findMaps().count(); moreMsg += QString("Contains %1 map%2: ").arg(mapCount).arg(DENG2_PLURAL_S(mapCount)) + + .arg(DE_PLURAL_S(mapCount)) + String::join(bundle->lumpDirectory()->mapsInContiguousRangesAsText(), ", "); moreMsg += "\n"; } diff --git a/doomsday/apps/client/src/ui/dialogs/packagesdialog.cpp b/doomsday/apps/client/src/ui/dialogs/packagesdialog.cpp index cb2694abb8..e3db093424 100644 --- a/doomsday/apps/client/src/ui/dialogs/packagesdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/packagesdialog.cpp @@ -46,10 +46,10 @@ using namespace de; -DENG_GUI_PIMPL(PackagesDialog) +DE_GUI_PIMPL(PackagesDialog) , public ChildWidgetOrganizer::IWidgetFactory , public PackagesWidget::IPackageStatus -, DENG2_OBSERVES(Widget, ChildAddition) +, DE_OBSERVES(Widget, ChildAddition) { StringList selectedPackages; LabelWidget *nothingSelected; @@ -359,7 +359,7 @@ DENG_GUI_PIMPL(PackagesDialog) { selectedPackages.removeOne(packageId); auto pos = menu->items().findData(packageId); - DENG2_ASSERT(pos != ui::Data::InvalidPos); + DE_ASSERT(pos != ui::Data::InvalidPos); menu->items().remove(pos); updateNothingIndicator(); updateGameTitle(); diff --git a/doomsday/apps/client/src/ui/dialogs/renderersettingsdialog.cpp b/doomsday/apps/client/src/ui/dialogs/renderersettingsdialog.cpp index 86e7de5672..86d019f807 100644 --- a/doomsday/apps/client/src/ui/dialogs/renderersettingsdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/renderersettingsdialog.cpp @@ -41,7 +41,7 @@ using namespace de; using namespace de::ui; -DENG_GUI_PIMPL(RendererSettingsDialog) +DE_GUI_PIMPL(RendererSettingsDialog) { ProfilePickerWidget *appear; CVarSliderWidget *fov; diff --git a/doomsday/apps/client/src/ui/dialogs/repositorybrowserdialog.cpp b/doomsday/apps/client/src/ui/dialogs/repositorybrowserdialog.cpp index a2eec81d14..37eda171eb 100644 --- a/doomsday/apps/client/src/ui/dialogs/repositorybrowserdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/repositorybrowserdialog.cpp @@ -39,8 +39,8 @@ using namespace de; static String const VAR_RESOURCE_BROWSER_REPOSITORY("resource.browserRepository"); static String const ALL_CATEGORIES(QObject::tr("All Categories")); -DENG_GUI_PIMPL(RepositoryBrowserDialog) -, DENG2_OBSERVES(filesys::RemoteFeedRelay, Status) +DE_GUI_PIMPL(RepositoryBrowserDialog) +, DE_OBSERVES(filesys::RemoteFeedRelay, Status) , public ChildWidgetOrganizer::IWidgetFactory , public AsyncScope { @@ -280,7 +280,7 @@ DENG_GUI_PIMPL(RepositoryBrowserDialog) populating.reset(); if (connectedRepository) { - DENG2_GUARD(linkBusy); + DE_GUARD(linkBusy); mountPath.clear(); connectedRepository.clear(); RFRelay::get().removeRepository(connectedRepository); @@ -290,7 +290,7 @@ DENG_GUI_PIMPL(RepositoryBrowserDialog) filesys::Link &link() { auto *link = RFRelay::get().repository(connectedRepository); - DENG2_ASSERT(link); + DE_ASSERT(link); return *link; } @@ -301,7 +301,7 @@ DENG_GUI_PIMPL(RepositoryBrowserDialog) *populating += async([this] () { - DENG2_GUARD(linkBusy); + DE_GUARD(linkBusy); // All packages from the remote repository are inserted to the data model. std::shared_ptr pkgs(new ui::ListData); link().forPackageIds([&pkgs] (String const &id) @@ -319,7 +319,7 @@ DENG_GUI_PIMPL(RepositoryBrowserDialog) void setData(std::shared_ptr newData) { - DENG2_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_IN_MAIN_THREAD(); //qDebug() << "got new data with" << newData->size() << "items"; nameList->useDefaultItems(); diff --git a/doomsday/apps/client/src/ui/dialogs/serverinfodialog.cpp b/doomsday/apps/client/src/ui/dialogs/serverinfodialog.cpp index 7bdc69c6e1..d0fd057b1b 100644 --- a/doomsday/apps/client/src/ui/dialogs/serverinfodialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/serverinfodialog.cpp @@ -44,9 +44,9 @@ static DialogWidget::RoleFlags const ID_SV_PACKAGES = DialogWidget::Id1; static DialogWidget::RoleFlags const ID_JOIN = DialogWidget::Id2; static DialogWidget::RoleFlags const ID_PING = DialogWidget::Id3; -DENG_GUI_PIMPL(ServerInfoDialog) -, DENG2_OBSERVES(ServerLink, MapOutline) -, DENG2_OBSERVES(ServerLink, PingResponse) +DE_GUI_PIMPL(ServerInfoDialog) +, DE_OBSERVES(ServerLink, MapOutline) +, DE_OBSERVES(ServerLink, PingResponse) , public PackagesWidget::IPackageStatus { // Server info & status. @@ -266,11 +266,11 @@ DENG_GUI_PIMPL(ServerInfoDialog) String plrDesc; if (players.isEmpty()) { - plrDesc = DENG2_CHAR_MDASH; + plrDesc = DE_CHAR_MDASH; } else { - plrDesc = String("%1 " DENG2_CHAR_MDASH " %2") + plrDesc = String("%1 " DE_CHAR_MDASH " %2") .arg(players.count()) .arg(String::join(players, ", ")); } @@ -281,7 +281,7 @@ DENG_GUI_PIMPL(ServerInfoDialog) .arg(tr("Rules")) .arg(serverInfo.gameConfig()) .arg(tr("Players")).arg(plrDesc) .arg(tr("Version")).arg(serverInfo.version().asHumanReadableText()) - .arg(tr("Ping")) .arg(ping < 0.0? String(DENG2_CHAR_MDASH) + .arg(tr("Ping")) .arg(ping < 0.0? String(DE_CHAR_MDASH) : String("%1 ms").arg(ping.asMilliSeconds())); description->setText(msg); } @@ -295,7 +295,7 @@ DENG_GUI_PIMPL(ServerInfoDialog) // Game state. { - String msg = String(_E(b) "%1" _E(.)_E(s) "\n%2 " DENG2_CHAR_MDASH " %3") + String msg = String(_E(b) "%1" _E(.)_E(s) "\n%2 " DE_CHAR_MDASH " %3") .arg(serverInfo.map()) .arg(serverInfo.gameConfig().containsWord("coop")? tr("Co-op") : tr("Deathmatch")) diff --git a/doomsday/apps/client/src/ui/dialogs/uisettingsdialog.cpp b/doomsday/apps/client/src/ui/dialogs/uisettingsdialog.cpp index c9cb9e55ec..3d5d1754ca 100644 --- a/doomsday/apps/client/src/ui/dialogs/uisettingsdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/uisettingsdialog.cpp @@ -28,7 +28,7 @@ using namespace de; -DENG2_PIMPL(UISettingsDialog) +DE_PIMPL(UISettingsDialog) { VariableChoiceWidget *uiScale; VariableToggleWidget *uiTranslucency; diff --git a/doomsday/apps/client/src/ui/dialogs/videosettingsdialog.cpp b/doomsday/apps/client/src/ui/dialogs/videosettingsdialog.cpp index b5590041e4..ced5ac2a3f 100644 --- a/doomsday/apps/client/src/ui/dialogs/videosettingsdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/videosettingsdialog.cpp @@ -44,9 +44,9 @@ using namespace de::ui; # define USE_COLOR_DEPTH_CHOICE #endif -DENG2_PIMPL(VideoSettingsDialog) -#if !defined (DENG_MOBILE) -, DENG2_OBSERVES(PersistentGLWindow, AttributeChange) +DE_PIMPL(VideoSettingsDialog) +#if !defined (DE_MOBILE) +, DE_OBSERVES(PersistentGLWindow, AttributeChange) #endif { ClientWindow &win; @@ -95,7 +95,7 @@ DENG2_PIMPL(VideoSettingsDialog) #ifdef USE_COLOR_DEPTH_CHOICE area.add(depths = new ChoiceWidget("depths")); #endif -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) win.audienceForAttributeChange() += this; #endif @@ -152,7 +152,7 @@ DENG2_PIMPL(VideoSettingsDialog) */ void fetch() { -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) fullscreen->setActive(win.isFullScreen()); maximized->setActive(win.isMaximized()); centered->setActive(win.isCentered()); @@ -194,7 +194,7 @@ DENG2_PIMPL(VideoSettingsDialog) depths->setSelected(depths->items().findData(win.colorDepthBits())); #endif -#endif // !DENG_MOBILE +#endif // !DE_MOBILE // FPS limit. if (fpsMax) @@ -212,7 +212,7 @@ DENG2_PIMPL(VideoSettingsDialog) } } -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) void windowAttributesChanged(PersistentGLWindow &) { fetch(); @@ -430,7 +430,7 @@ void VideoSettingsDialog::resetToDefaults() d->fetch(); } -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) void VideoSettingsDialog::changeMode(uint selected) { @@ -453,7 +453,7 @@ void VideoSettingsDialog::changeColorDepth(uint selected) Con_Executef(CMDS_DDAY, true, "setcolordepth %i", d->depths->items().at(selected).data().toInt()); #else - DENG2_UNUSED(selected); + DE_UNUSED(selected); #endif } @@ -467,7 +467,7 @@ void VideoSettingsDialog::changeRefreshRate(uint selected) }; d->win.changeAttributes(attribs); #else - DENG2_UNUSED(selected); + DE_UNUSED(selected); #endif } diff --git a/doomsday/apps/client/src/ui/dialogs/vrsettingsdialog.cpp b/doomsday/apps/client/src/ui/dialogs/vrsettingsdialog.cpp index 80d3053618..d864c2b3ee 100644 --- a/doomsday/apps/client/src/ui/dialogs/vrsettingsdialog.cpp +++ b/doomsday/apps/client/src/ui/dialogs/vrsettingsdialog.cpp @@ -33,7 +33,7 @@ using namespace de; using namespace de::ui; -DENG_GUI_PIMPL(VRSettingsDialog) +DE_GUI_PIMPL(VRSettingsDialog) { CVarChoiceWidget *mode; CVarToggleWidget *swapEyes; @@ -136,7 +136,7 @@ VRSettingsDialog::VRSettingsDialog(String const &name) << *dominantLabel << *d->dominantEye << Const(0) << *d->swapEyes; -#ifdef DENG_HAVE_OCULUS_API +#ifdef DE_HAVE_OCULUS_API LabelWidget *ovrLabel = LabelWidget::newWithText(_E(D) + tr("Oculus Rift"), &area()); LabelWidget *sampleLabel = LabelWidget::newWithText(tr("Multisampling:"), &area()); ovrLabel->setFont("separator.label"); diff --git a/doomsday/apps/client/src/ui/editors/modelasseteditor.cpp b/doomsday/apps/client/src/ui/editors/modelasseteditor.cpp index c516554e02..af653e0014 100644 --- a/doomsday/apps/client/src/ui/editors/modelasseteditor.cpp +++ b/doomsday/apps/client/src/ui/editors/modelasseteditor.cpp @@ -53,9 +53,9 @@ struct PlayData }; Q_DECLARE_METATYPE(PlayData) -DENG_GUI_PIMPL(ModelAssetEditor) -, DENG2_OBSERVES(PackageLoader, Activity) -, DENG2_OBSERVES(PanelWidget, AboutToOpen) +DE_GUI_PIMPL(ModelAssetEditor) +, DE_OBSERVES(PackageLoader, Activity) +, DE_OBSERVES(PanelWidget, AboutToOpen) , public VariableGroupEditor::IOwner { using Group = VariableGroupEditor; diff --git a/doomsday/apps/client/src/ui/editors/rendererappearanceeditor.cpp b/doomsday/apps/client/src/ui/editors/rendererappearanceeditor.cpp index e656e13444..845ccb7e9c 100644 --- a/doomsday/apps/client/src/ui/editors/rendererappearanceeditor.cpp +++ b/doomsday/apps/client/src/ui/editors/rendererappearanceeditor.cpp @@ -37,8 +37,8 @@ using namespace de; using namespace de::ui; -DENG_GUI_PIMPL(RendererAppearanceEditor), -DENG2_OBSERVES(ConfigProfiles, ProfileChange), +DE_GUI_PIMPL(RendererAppearanceEditor), +DE_OBSERVES(ConfigProfiles, ProfileChange), public VariableGroupEditor::IOwner { using Group = VariableGroupEditor; diff --git a/doomsday/apps/client/src/ui/editors/variablegroupeditor.cpp b/doomsday/apps/client/src/ui/editors/variablegroupeditor.cpp index 2839d0abfa..c218366a6a 100644 --- a/doomsday/apps/client/src/ui/editors/variablegroupeditor.cpp +++ b/doomsday/apps/client/src/ui/editors/variablegroupeditor.cpp @@ -58,7 +58,7 @@ struct RightClickHandler : public GuiWidget::IEventHandler } }; -DENG2_PIMPL(VariableGroupEditor) +DE_PIMPL(VariableGroupEditor) { IOwner *owner; bool resetable = false; diff --git a/doomsday/apps/client/src/ui/home/columnwidget.cpp b/doomsday/apps/client/src/ui/home/columnwidget.cpp index 4601562ad1..b41bf8fc21 100644 --- a/doomsday/apps/client/src/ui/home/columnwidget.cpp +++ b/doomsday/apps/client/src/ui/home/columnwidget.cpp @@ -29,7 +29,7 @@ using namespace de; -DENG_GUI_PIMPL(ColumnWidget) +DE_GUI_PIMPL(ColumnWidget) { /** * Procedural image for drawing the background of a column. diff --git a/doomsday/apps/client/src/ui/home/gamecolumnwidget.cpp b/doomsday/apps/client/src/ui/home/gamecolumnwidget.cpp index c0e396d3a2..0440e0168c 100644 --- a/doomsday/apps/client/src/ui/home/gamecolumnwidget.cpp +++ b/doomsday/apps/client/src/ui/home/gamecolumnwidget.cpp @@ -54,11 +54,11 @@ static const String VAR_SORT_BY("home.sortBy"); static const String VAR_SORT_ASCENDING("home.sortAscending"); static const String VAR_SORT_CUSTOM_SEPARATELY("home.sortCustomSeparately"); -DENG_GUI_PIMPL(GameColumnWidget) -, DENG2_OBSERVES(Games, Readiness) -, DENG2_OBSERVES(Profiles, Addition) -, DENG2_OBSERVES(Variable, Change) -, DENG2_OBSERVES(ButtonWidget, StateChange) +DE_GUI_PIMPL(GameColumnWidget) +, DE_OBSERVES(Games, Readiness) +, DE_OBSERVES(Profiles, Addition) +, DE_OBSERVES(Variable, Change) +, DE_OBSERVES(ButtonWidget, StateChange) , DENG2_OBSERVES(Profiles::AbstractProfile, Change) , public ChildWidgetOrganizer::IWidgetFactory { @@ -67,7 +67,7 @@ DENG_GUI_PIMPL(GameColumnWidget) */ struct ProfileItem : public ui::Item - , DENG2_OBSERVES(Deletable, Deletion) // profile deletion + , DE_OBSERVES(Deletable, Deletion) // profile deletion { GameColumnWidget::Impl *d; GameProfile *profile; @@ -82,7 +82,7 @@ DENG_GUI_PIMPL(GameColumnWidget) Game const &game() const { - DENG2_ASSERT(profile != nullptr); + DE_ASSERT(profile != nullptr); return profile->game(); } @@ -92,8 +92,8 @@ DENG_GUI_PIMPL(GameColumnWidget) void objectWasDeleted(Deletable *obj) { - DENG2_ASSERT(static_cast(obj) == profile); - DENG2_UNUSED(obj); + DE_ASSERT(static_cast(obj) == profile); + DE_UNUSED(obj); profile = nullptr; d->addOrRemoveSubheading(); @@ -102,7 +102,7 @@ DENG_GUI_PIMPL(GameColumnWidget) items.remove(items.find(*this)); // item deleted } - DENG2_CAST_METHODS() + DE_CAST_METHODS() }; LoopCallback mainCall; @@ -183,7 +183,7 @@ DENG_GUI_PIMPL(GameColumnWidget) GamePanelButtonWidget &widgetForItem(ui::Item const &item) const { - DENG2_ASSERT(menu->items().find(item) != ui::Data::InvalidPos); + DE_ASSERT(menu->items().find(item) != ui::Data::InvalidPos); return menu->itemWidget(item); } @@ -209,7 +209,7 @@ DENG_GUI_PIMPL(GameColumnWidget) { if (profile.game().family() == gameFamily) { - DENG2_ASSERT(!findProfileItem(profile)); + DE_ASSERT(!findProfileItem(profile)); menu->items() << new ProfileItem(this, profile); addOrRemoveSubheading(); profile.audienceForChange() += this; @@ -230,7 +230,7 @@ DENG_GUI_PIMPL(GameColumnWidget) // Highlight the newly added item. auto const *newItem = findProfileItem(prof.as()); - DENG2_ASSERT(newItem); + DE_ASSERT(newItem); menu->setSelectedIndex(menu->items().find(*newItem)); } }); @@ -503,6 +503,10 @@ DENG_GUI_PIMPL(GameColumnWidget) } })); } + else + { + popup->items() << new ui::ActionItem(tr("Mods..."), new SignalAction(button, SLOT(selectPackages()))); + } // Items suitable for all types of profiles. popup->items() diff --git a/doomsday/apps/client/src/ui/home/gamepanelbuttonwidget.cpp b/doomsday/apps/client/src/ui/home/gamepanelbuttonwidget.cpp index a433b5be4a..777b9b7e80 100644 --- a/doomsday/apps/client/src/ui/home/gamepanelbuttonwidget.cpp +++ b/doomsday/apps/client/src/ui/home/gamepanelbuttonwidget.cpp @@ -45,9 +45,9 @@ using namespace de; -DENG_GUI_PIMPL(GamePanelButtonWidget) -, DENG2_OBSERVES(Profiles::AbstractProfile, Change) -, DENG2_OBSERVES(res::Bundles, Identify) +DE_GUI_PIMPL(GamePanelButtonWidget) +, DE_OBSERVES(Profiles::AbstractProfile, Change) +, DE_OBSERVES(res::Bundles, Identify) , DENG2_OBSERVES(Variable, Change) , DENG2_OBSERVES(ButtonWidget, StateChange) , public AsyncScope @@ -239,7 +239,7 @@ DENG_GUI_PIMPL(GamePanelButtonWidget) void deleteButtonPressed() { - DENG2_ASSERT(saves->selectedPos() != ui::Data::InvalidPos); + DE_ASSERT(saves->selectedPos() != ui::Data::InvalidPos); // Popup to make sure. PopupMenuWidget *pop = new PopupMenuWidget; @@ -460,7 +460,7 @@ void GamePanelButtonWidget::saveSelected(de::ui::DataPos savePos) if (savePos != ui::Data::InvalidPos) { // Ensure that this game is selected. - DENG2_ASSERT(parentMenu() != nullptr); + DE_ASSERT(parentMenu() != nullptr); parentMenu()->setSelectedIndex(parentMenu()->findItem(*this)); // Position the save deletion button. diff --git a/doomsday/apps/client/src/ui/home/headerwidget.cpp b/doomsday/apps/client/src/ui/home/headerwidget.cpp index 9ab7098cf7..1a6ecec79d 100644 --- a/doomsday/apps/client/src/ui/home/headerwidget.cpp +++ b/doomsday/apps/client/src/ui/home/headerwidget.cpp @@ -26,8 +26,8 @@ using namespace de; -DENG_GUI_PIMPL(HeaderWidget) -, DENG2_OBSERVES(Variable, Change) +DE_GUI_PIMPL(HeaderWidget) +, DE_OBSERVES(Variable, Change) { LabelWidget *logo; LabelWidget *logoBg; /// @todo Backgrounds should support ProceduralImages. -jk diff --git a/doomsday/apps/client/src/ui/home/homewidget.cpp b/doomsday/apps/client/src/ui/home/homewidget.cpp index 95bb2b8e96..d007657540 100644 --- a/doomsday/apps/client/src/ui/home/homewidget.cpp +++ b/doomsday/apps/client/src/ui/home/homewidget.cpp @@ -48,13 +48,13 @@ using namespace de; static TimeSpan const SCROLL_SPAN = .5; static TimeSpan const DISMISS_SPAN = 1.5; -DENG_GUI_PIMPL(HomeWidget) -, DENG2_OBSERVES(App, StartupComplete) -, DENG2_OBSERVES(Games, Readiness) -, DENG2_OBSERVES(DoomsdayApp, GameLoad) -, DENG2_OBSERVES(DoomsdayApp, GameChange) -, DENG2_OBSERVES(Variable, Change) -, DENG2_OBSERVES(ButtonWidget, StateChange) +DE_GUI_PIMPL(HomeWidget) +, DE_OBSERVES(App, StartupComplete) +, DE_OBSERVES(Games, Readiness) +, DE_OBSERVES(DoomsdayApp, GameLoad) +, DE_OBSERVES(DoomsdayApp, GameChange) +, DE_OBSERVES(Variable, Change) +, DE_OBSERVES(ButtonWidget, StateChange) { struct Column { ColumnWidget *widget; diff --git a/doomsday/apps/client/src/ui/home/multiplayercolumnwidget.cpp b/doomsday/apps/client/src/ui/home/multiplayercolumnwidget.cpp index f046123dc7..ccbbc22448 100644 --- a/doomsday/apps/client/src/ui/home/multiplayercolumnwidget.cpp +++ b/doomsday/apps/client/src/ui/home/multiplayercolumnwidget.cpp @@ -33,9 +33,9 @@ using namespace de; -DENG_GUI_PIMPL(MultiplayerColumnWidget) -, DENG2_OBSERVES(ui::Data, Addition) -, DENG2_OBSERVES(ui::Data, Removal) +DE_GUI_PIMPL(MultiplayerColumnWidget) +, DE_OBSERVES(ui::Data, Addition) +, DE_OBSERVES(ui::Data, Removal) { MultiplayerServerMenuWidget *menu; LabelWidget *noServers; diff --git a/doomsday/apps/client/src/ui/home/multiplayerpanelbuttonwidget.cpp b/doomsday/apps/client/src/ui/home/multiplayerpanelbuttonwidget.cpp index a1d887b76f..45bcd74edd 100644 --- a/doomsday/apps/client/src/ui/home/multiplayerpanelbuttonwidget.cpp +++ b/doomsday/apps/client/src/ui/home/multiplayerpanelbuttonwidget.cpp @@ -42,8 +42,8 @@ using namespace de; -DENG_GUI_PIMPL(MultiplayerPanelButtonWidget) -, DENG2_OBSERVES(Games, Readiness) +DE_GUI_PIMPL(MultiplayerPanelButtonWidget) +, DE_OBSERVES(Games, Readiness) , public AsyncScope { shell::ServerInfo serverInfo; @@ -99,7 +99,7 @@ DENG_GUI_PIMPL(MultiplayerPanelButtonWidget) void joinButtonPressed() const { self().root().setFocus(nullptr); - DENG2_FOR_PUBLIC_AUDIENCE2(AboutToJoin, i) + DE_FOR_PUBLIC_AUDIENCE2(AboutToJoin, i) { i->aboutToJoinMultiplayerGame(serverInfo); } @@ -118,10 +118,10 @@ DENG_GUI_PIMPL(MultiplayerPanelButtonWidget) self().updateContent(serverInfo); } - DENG2_PIMPL_AUDIENCE(AboutToJoin) + DE_PIMPL_AUDIENCE(AboutToJoin) }; -DENG2_AUDIENCE_METHOD(MultiplayerPanelButtonWidget, AboutToJoin) +DE_AUDIENCE_METHOD(MultiplayerPanelButtonWidget, AboutToJoin) MultiplayerPanelButtonWidget::MultiplayerPanelButtonWidget() : d(new Impl(this)) @@ -149,7 +149,7 @@ void MultiplayerPanelButtonWidget::updateContent(shell::ServerInfo const &info) d->serverInfo = info; d->gameConfig = info.gameConfig(); -#define DIM_MDASH _E(C) DENG2_CHAR_MDASH _E(.) +#define DIM_MDASH _E(C) DE_CHAR_MDASH _E(.) //label().setText(info.name); String meta; @@ -158,7 +158,7 @@ void MultiplayerPanelButtonWidget::updateContent(shell::ServerInfo const &info) { meta = String("%1 player%2 " DIM_MDASH " ") .arg(playerCount) - .arg(DENG2_PLURAL_S(playerCount)); + .arg(DE_PLURAL_S(playerCount)); } meta += String("%1").arg(tr(d->hasConfig("coop")? "Co-op" : @@ -206,7 +206,7 @@ void MultiplayerPanelButtonWidget::updateContent(shell::ServerInfo const &info) if (localCount) { infoText += "\n" _E(D)_E(b) + String("%1 local package%2").arg(localCount) - .arg(DENG2_PLURAL_S(localCount)); + .arg(DE_PLURAL_S(localCount)); } d->info->setFont("small"); diff --git a/doomsday/apps/client/src/ui/home/nogamescolumnwidget.cpp b/doomsday/apps/client/src/ui/home/nogamescolumnwidget.cpp index 3f2c623c74..5d106b5e2d 100644 --- a/doomsday/apps/client/src/ui/home/nogamescolumnwidget.cpp +++ b/doomsday/apps/client/src/ui/home/nogamescolumnwidget.cpp @@ -64,7 +64,7 @@ void NoGamesColumnWidget::browseForDataFiles() { bool reload = false; -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) // Use a native dialog to select the IWAD folder. ClientApp::app().beginNativeUIMode(); diff --git a/doomsday/apps/client/src/ui/home/packagescolumnwidget.cpp b/doomsday/apps/client/src/ui/home/packagescolumnwidget.cpp index 6de5945a0e..9a80eea9d9 100644 --- a/doomsday/apps/client/src/ui/home/packagescolumnwidget.cpp +++ b/doomsday/apps/client/src/ui/home/packagescolumnwidget.cpp @@ -40,8 +40,8 @@ using namespace de; -DENG_GUI_PIMPL(PackagesColumnWidget) -, DENG2_OBSERVES(DoomsdayApp, GameChange) +DE_GUI_PIMPL(PackagesColumnWidget) +, DE_OBSERVES(DoomsdayApp, GameChange) { PackagesWidget *packages; LabelWidget *countLabel; diff --git a/doomsday/apps/client/src/ui/home/savelistwidget.cpp b/doomsday/apps/client/src/ui/home/savelistwidget.cpp index f07d3ea324..e5da54c7e8 100644 --- a/doomsday/apps/client/src/ui/home/savelistwidget.cpp +++ b/doomsday/apps/client/src/ui/home/savelistwidget.cpp @@ -29,8 +29,8 @@ using namespace de; -DENG_GUI_PIMPL(SaveListWidget) -, DENG2_OBSERVES(ChildWidgetOrganizer, WidgetUpdate) +DE_GUI_PIMPL(SaveListWidget) +, DE_OBSERVES(ChildWidgetOrganizer, WidgetUpdate) { /** * Handles mouse button doubleclicks on the save items. diff --git a/doomsday/apps/client/src/ui/impulsebinding.cpp b/doomsday/apps/client/src/ui/impulsebinding.cpp index 7f465f8316..9e427411a5 100644 --- a/doomsday/apps/client/src/ui/impulsebinding.cpp +++ b/doomsday/apps/client/src/ui/impulsebinding.cpp @@ -87,7 +87,7 @@ String ImpulseBinding::composeDescriptor() // Append any state conditions. ArrayValue const &conds = def().geta("condition"); - DENG2_FOR_EACH_CONST(ArrayValue::Elements, i, conds.elements()) + DE_FOR_EACH_CONST(ArrayValue::Elements, i, conds.elements()) { str += " + " + B_ConditionToString(*(*i)->as().record()); } @@ -97,7 +97,7 @@ String ImpulseBinding::composeDescriptor() static bool doConfigure(ImpulseBinding &bind, char const *ctrlDesc, int impulseId, int localPlayer) { - DENG2_ASSERT(ctrlDesc); + DE_ASSERT(ctrlDesc); bind.resetToDefaults(); bind.def().set("impulseId", impulseId); @@ -189,8 +189,8 @@ static bool doConfigure(ImpulseBinding &bind, char const *ctrlDesc, int impulseI void ImpulseBinding::configure(char const *ctrlDesc, int impulseId, int localPlayer, bool assignNewId) { - DENG2_ASSERT(ctrlDesc); - DENG2_ASSERT(localPlayer >= 0 && localPlayer < DDMAXPLAYERS); + DE_ASSERT(ctrlDesc); + DE_ASSERT(localPlayer >= 0 && localPlayer < DDMAXPLAYERS); LOG_AS("ImpulseBinding"); // The first part specifies the device-control condition. diff --git a/doomsday/apps/client/src/ui/infine/finale.cpp b/doomsday/apps/client/src/ui/infine/finale.cpp index 993bc1d3f5..bfd7b87160 100644 --- a/doomsday/apps/client/src/ui/infine/finale.cpp +++ b/doomsday/apps/client/src/ui/infine/finale.cpp @@ -29,7 +29,7 @@ using namespace de; -DENG2_PIMPL(Finale) +DE_PIMPL(Finale) { bool active; int flags; ///< @ref finaleFlags @@ -46,7 +46,7 @@ DENG2_PIMPL(Finale) ~Impl() { - DENG2_FOR_PUBLIC_AUDIENCE2(Deletion, i) i->finaleBeingDeleted(self()); + DE_FOR_PUBLIC_AUDIENCE2(Deletion, i) i->finaleBeingDeleted(self()); } void loadScript(String const &script) @@ -67,10 +67,10 @@ DENG2_PIMPL(Finale) active = true; } - DENG2_PIMPL_AUDIENCE(Deletion) + DE_PIMPL_AUDIENCE(Deletion) }; -DENG2_AUDIENCE_METHOD(Finale, Deletion) +DE_AUDIENCE_METHOD(Finale, Deletion) Finale::Finale(int flags, finaleid_t id, String const &script) : d(new Impl(this, flags, id)) diff --git a/doomsday/apps/client/src/ui/infine/finaleanimwidget.cpp b/doomsday/apps/client/src/ui/infine/finaleanimwidget.cpp index 9961f809f9..c807ed1c35 100644 --- a/doomsday/apps/client/src/ui/infine/finaleanimwidget.cpp +++ b/doomsday/apps/client/src/ui/infine/finaleanimwidget.cpp @@ -55,7 +55,7 @@ FinaleAnimWidget::Frame::~Frame() #endif } -DENG2_PIMPL_NOREF(FinaleAnimWidget) +DE_PIMPL_NOREF(FinaleAnimWidget) { bool animComplete = true; bool animLooping = false; ///< @c true= loop back to the start when the end is reached. diff --git a/doomsday/apps/client/src/ui/infine/finaleinterpreter.cpp b/doomsday/apps/client/src/ui/infine/finaleinterpreter.cpp index 4bcc3068c7..a14f66f9f8 100644 --- a/doomsday/apps/client/src/ui/infine/finaleinterpreter.cpp +++ b/doomsday/apps/client/src/ui/infine/finaleinterpreter.cpp @@ -368,7 +368,7 @@ static command_t const *findCommand(char const *name) return nullptr; // Not found. } -DENG2_PIMPL(FinaleInterpreter) +DE_PIMPL(FinaleInterpreter) { struct Flags { @@ -492,7 +492,7 @@ DENG2_PIMPL(FinaleInterpreter) bool atEnd() const { - DENG2_ASSERT(script); + DE_ASSERT(script); return (cp - Str_Text(script)) >= Str_Length(script); } @@ -561,7 +561,7 @@ DENG2_PIMPL(FinaleInterpreter) char const *defaultValueEnd; for (defaultValueEnd = str; defaultValueEnd && *defaultValueEnd != ')'; defaultValueEnd++) {} - DENG2_ASSERT(defaultValueEnd < str + qstrlen(str)); + DE_ASSERT(defaultValueEnd < str + qstrlen(str)); return defaultValueEnd; } @@ -602,7 +602,7 @@ DENG2_PIMPL(FinaleInterpreter) */ fi_operand_t *prepareCommandOperands(command_t const *cmd, int *count) { - DENG2_ASSERT(cmd); + DE_ASSERT(cmd); char const *origCursorPos = cp; int const operandCount = countCommandOperands(cmd->operands); @@ -697,7 +697,7 @@ DENG2_PIMPL(FinaleInterpreter) bool skippingCommand(command_t const *cmd) { - DENG2_ASSERT(cmd); + DE_ASSERT(cmd); if ((skipNext && !cmd->flags.when_condition_skipping) || ((skipping || gotoSkip) && !cmd->flags.when_skipping)) { @@ -718,7 +718,7 @@ DENG2_PIMPL(FinaleInterpreter) */ bool executeCommand(char const *commandString, int directive) { - DENG2_ASSERT(commandString); + DE_ASSERT(commandString); bool didSkip = false; // Semicolon terminates DO-blocks. @@ -885,7 +885,7 @@ finaleid_t FinaleInterpreter::id() const void FinaleInterpreter::loadScript(char const *script) { - DENG2_ASSERT(script && script[0]); + DE_ASSERT(script && script[0]); d->pages[Anims].reset(new FinalePageWidget); d->pages[Texts].reset(new FinalePageWidget); @@ -1205,7 +1205,7 @@ FinalePageWidget &FinaleInterpreter::page(PageIndex index) { if (index >= Anims && index <= Texts) { - DENG2_ASSERT(d->pages[index]); + DE_ASSERT(d->pages[index]); return *d->pages[index]; } throw MissingPageError("FinaleInterpreter::page", "Unknown page #" + String::number(int(index))); @@ -1242,8 +1242,8 @@ FinaleWidget &FinaleInterpreter::findWidget(fi_obtype_e type, String const &name FinaleWidget &FinaleInterpreter::findOrCreateWidget(fi_obtype_e type, String const &name) { - DENG2_ASSERT(type >= FI_ANIM && type <= FI_TEXT); - DENG2_ASSERT(!name.isEmpty()); + DE_ASSERT(type >= FI_ANIM && type <= FI_TEXT); + DE_ASSERT(!name.isEmpty()); if (FinaleWidget *foundWidget = d->locateWidget(type, name)) { return *foundWidget; @@ -1338,13 +1338,13 @@ void FinaleInterpreter::setWaitText(FinaleTextWidget *newWaitText) /// @note This command is called even when condition-skipping. DEFFC(Do) { - DENG2_UNUSED2(cmd, ops); + DE_UNUSED(cmd, ops); fi.beginDoSkipMode(); } DEFFC(End) { - DENG2_UNUSED2(cmd, ops); + DE_UNUSED(cmd, ops); fi.gotoEnd(); } @@ -1361,7 +1361,7 @@ static void changePageBackground(FinalePageWidget &page, world::Material *newMat DEFFC(BGMaterial) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); // First attempt to resolve as a Values URI (which defines the material URI). world::Material *material = nullptr; @@ -1386,43 +1386,43 @@ DEFFC(BGMaterial) DEFFC(NoBGMaterial) { - DENG2_UNUSED2(cmd, ops); + DE_UNUSED(cmd, ops); changePageBackground(fi.page(FinaleInterpreter::Anims), 0); } DEFFC(InTime) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); fi.setInTime(FRACSECS_TO_TICKS(OP_FLOAT(0))); } DEFFC(Tic) { - DENG2_UNUSED2(cmd, ops); + DE_UNUSED(cmd, ops); fi.wait(); } DEFFC(Wait) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); fi.wait(FRACSECS_TO_TICKS(OP_FLOAT(0))); } DEFFC(WaitText) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); fi.setWaitText(&fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)).as()); } DEFFC(WaitAnim) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); fi.setWaitAnim(&fi.findOrCreateWidget(FI_ANIM, OP_CSTRING(0)).as()); } DEFFC(Color) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); fi.page(FinaleInterpreter::Anims) .setBackgroundTopColor (Vec3f(OP_FLOAT(0), OP_FLOAT(1), OP_FLOAT(2)), fi.inTime()) .setBackgroundBottomColor(Vec3f(OP_FLOAT(0), OP_FLOAT(1), OP_FLOAT(2)), fi.inTime()); @@ -1430,7 +1430,7 @@ DEFFC(Color) DEFFC(ColorAlpha) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); fi.page(FinaleInterpreter::Anims) .setBackgroundTopColorAndAlpha (Vec4f(OP_FLOAT(0), OP_FLOAT(1), OP_FLOAT(2), OP_FLOAT(3)), fi.inTime()) .setBackgroundBottomColorAndAlpha(Vec4f(OP_FLOAT(0), OP_FLOAT(1), OP_FLOAT(2), OP_FLOAT(3)), fi.inTime()); @@ -1438,44 +1438,44 @@ DEFFC(ColorAlpha) DEFFC(Pause) { - DENG2_UNUSED2(cmd, ops); + DE_UNUSED(cmd, ops); fi.pause(); } DEFFC(CanSkip) { - DENG2_UNUSED2(cmd, ops); + DE_UNUSED(cmd, ops); fi.setSkip(true); } DEFFC(NoSkip) { - DENG2_UNUSED2(cmd, ops); + DE_UNUSED(cmd, ops); fi.setSkip(false); } DEFFC(SkipHere) { - DENG2_UNUSED2(cmd, ops); + DE_UNUSED(cmd, ops); fi.foundSkipHere(); } DEFFC(Events) { - DENG2_UNUSED2(cmd, ops); + DE_UNUSED(cmd, ops); fi.setHandleEvents(); } DEFFC(NoEvents) { - DENG2_UNUSED2(cmd, ops); + DE_UNUSED(cmd, ops); fi.setHandleEvents(false); } DEFFC(OnKey) { #ifdef __CLIENT__ - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); // Construct a template event for this handler. ddevent_t ev; de::zap(ev); @@ -1486,14 +1486,14 @@ DEFFC(OnKey) fi.addEventHandler(ev, OP_CSTRING(1)); #else - DENG2_UNUSED3(cmd, ops, fi); + DE_UNUSED(cmd, ops, fi); #endif } DEFFC(UnsetKey) { #ifdef __CLIENT__ - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); // Construct a template event for what we want to "unset". ddevent_t ev; de::zap(ev); @@ -1504,13 +1504,13 @@ DEFFC(UnsetKey) fi.removeEventHandler(ev); #else - DENG2_UNUSED3(cmd, ops, fi); + DE_UNUSED(cmd, ops, fi); #endif } DEFFC(If) { - DENG2_UNUSED2(cmd, ops); + DE_UNUSED(cmd, ops); LOG_AS("FIC_If"); char const *token = OP_CSTRING(0); @@ -1562,31 +1562,31 @@ DEFFC(IfNot) /// @note The only time the ELSE condition does not skip is immediately after a skip. DEFFC(Else) { - DENG2_UNUSED2(cmd, ops); + DE_UNUSED(cmd, ops); fi.setSkipNext(!fi.lastSkipped()); } DEFFC(GoTo) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); fi.skipToMarker(OP_CSTRING(0)); } DEFFC(Marker) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); fi.foundSkipMarker(OP_CSTRING(0)); } DEFFC(Delete) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); delete fi.tryFindWidget(OP_CSTRING(0)); } DEFFC(Image) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); LOG_AS("FIC_Image"); FinaleAnimWidget &anim = fi.findOrCreateWidget(FI_ANIM, OP_CSTRING(0)).as(); @@ -1608,7 +1608,7 @@ DEFFC(Image) DEFFC(ImageAt) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); LOG_AS("FIC_ImageAt"); FinaleAnimWidget &anim = fi.findOrCreateWidget(FI_ANIM, OP_CSTRING(0)).as(); @@ -1660,7 +1660,7 @@ static DGLuint loadAndPrepareExtTexture(char const *fileName) DEFFC(XImage) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); LOG_AS("FIC_XImage"); @@ -1686,7 +1686,7 @@ DEFFC(XImage) DEFFC(Patch) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); LOG_AS("FIC_Patch"); FinaleAnimWidget &anim = fi.findOrCreateWidget(FI_ANIM, OP_CSTRING(0)).as(); @@ -1708,7 +1708,7 @@ DEFFC(Patch) DEFFC(SetPatch) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); LOG_AS("FIC_SetPatch"); FinaleAnimWidget &anim = fi.findOrCreateWidget(FI_ANIM, OP_CSTRING(0)).as(); @@ -1737,7 +1737,7 @@ DEFFC(SetPatch) DEFFC(ClearAnim) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); if (FinaleWidget *wi = fi.tryFindWidget(OP_CSTRING(0))) { if (FinaleAnimWidget *anim = maybeAs(wi)) @@ -1749,7 +1749,7 @@ DEFFC(ClearAnim) DEFFC(Anim) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); LOG_AS("FIC_Anim"); FinaleAnimWidget &anim = fi.findOrCreateWidget(FI_ANIM, OP_CSTRING(0)).as(); @@ -1768,7 +1768,7 @@ DEFFC(Anim) DEFFC(AnimImage) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); LOG_AS("FIC_AnimImage"); FinaleAnimWidget &anim = fi.findOrCreateWidget(FI_ANIM, OP_CSTRING(0)).as(); @@ -1784,23 +1784,23 @@ DEFFC(AnimImage) } LOG_SCR_WARNING("Lump '%s' not found") << encodedName; #else - DENG2_UNUSED(anim); + DE_UNUSED(anim); #endif } DEFFC(Repeat) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleAnimWidget &anim = fi.findOrCreateWidget(FI_ANIM, OP_CSTRING(0)).as(); anim.setLooping(); } DEFFC(StateAnim) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleAnimWidget &anim = fi.findOrCreateWidget(FI_ANIM, OP_CSTRING(0)).as(); #if !defined(__CLIENT__) - DENG2_UNUSED(anim); + DE_UNUSED(anim); #endif // Animate N states starting from the given one. @@ -1821,7 +1821,7 @@ DEFFC(StateAnim) DEFFC(PicSound) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleAnimWidget &anim = fi.findOrCreateWidget(FI_ANIM, OP_CSTRING(0)).as(); int const sound = DED_Definitions()->getSoundNum(OP_CSTRING(1)); @@ -1836,7 +1836,7 @@ DEFFC(PicSound) DEFFC(ObjectOffX) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); if (FinaleWidget *wi = fi.tryFindWidget(OP_CSTRING(0))) { wi->setOriginX(OP_FLOAT(1), fi.inTime()); @@ -1845,7 +1845,7 @@ DEFFC(ObjectOffX) DEFFC(ObjectOffY) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); if (FinaleWidget *wi = fi.tryFindWidget(OP_CSTRING(0))) { wi->setOriginY(OP_FLOAT(1), fi.inTime()); @@ -1854,7 +1854,7 @@ DEFFC(ObjectOffY) DEFFC(ObjectOffZ) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); if (FinaleWidget *wi = fi.tryFindWidget(OP_CSTRING(0))) { wi->setOriginZ(OP_FLOAT(1), fi.inTime()); @@ -1863,7 +1863,7 @@ DEFFC(ObjectOffZ) DEFFC(ObjectRGB) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); if (FinaleWidget *wi = fi.tryFindWidget(OP_CSTRING(0))) { Vec3f const color(OP_FLOAT(1), OP_FLOAT(2), OP_FLOAT(3)); @@ -1884,7 +1884,7 @@ DEFFC(ObjectRGB) DEFFC(ObjectAlpha) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); if (FinaleWidget *wi = fi.tryFindWidget(OP_CSTRING(0))) { float const alpha = OP_FLOAT(1); @@ -1902,7 +1902,7 @@ DEFFC(ObjectAlpha) DEFFC(ObjectScaleX) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); if (FinaleWidget *wi = fi.tryFindWidget(OP_CSTRING(0))) { wi->setScaleX(OP_FLOAT(1), fi.inTime()); @@ -1911,7 +1911,7 @@ DEFFC(ObjectScaleX) DEFFC(ObjectScaleY) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); if (FinaleWidget *wi = fi.tryFindWidget(OP_CSTRING(0))) { wi->setScaleY(OP_FLOAT(1), fi.inTime()); @@ -1920,7 +1920,7 @@ DEFFC(ObjectScaleY) DEFFC(ObjectScaleZ) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); if (FinaleWidget *wi = fi.tryFindWidget(OP_CSTRING(0))) { wi->setScaleZ(OP_FLOAT(1), fi.inTime()); @@ -1929,7 +1929,7 @@ DEFFC(ObjectScaleZ) DEFFC(ObjectScale) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); if (FinaleWidget *wi = fi.tryFindWidget(OP_CSTRING(0))) { wi->setScaleX(OP_FLOAT(1), fi.inTime()) @@ -1939,7 +1939,7 @@ DEFFC(ObjectScale) DEFFC(ObjectScaleXY) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); if (FinaleWidget *wi = fi.tryFindWidget(OP_CSTRING(0))) { wi->setScaleX(OP_FLOAT(1), fi.inTime()) @@ -1949,7 +1949,7 @@ DEFFC(ObjectScaleXY) DEFFC(ObjectScaleXYZ) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); if (FinaleWidget *wi = fi.tryFindWidget(OP_CSTRING(0))) { wi->setScale(Vec3f(OP_FLOAT(1), OP_FLOAT(2), OP_FLOAT(3)), fi.inTime()); @@ -1958,7 +1958,7 @@ DEFFC(ObjectScaleXYZ) DEFFC(ObjectAngle) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); if (FinaleWidget *wi = fi.tryFindWidget(OP_CSTRING(0))) { wi->setAngle(OP_FLOAT(1), fi.inTime()); @@ -1967,7 +1967,7 @@ DEFFC(ObjectAngle) DEFFC(Rect) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleAnimWidget &anim = fi.findOrCreateWidget(FI_ANIM, OP_CSTRING(0)).as(); /// @note We may be converting an existing Pic to a Rect, so re-init the expected @@ -1982,7 +1982,7 @@ DEFFC(Rect) DEFFC(FillColor) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleWidget *wi = fi.tryFindWidget(OP_CSTRING(0)); if (!wi || !is(wi)) return; FinaleAnimWidget &anim = wi->as(); @@ -2007,7 +2007,7 @@ DEFFC(FillColor) DEFFC(EdgeColor) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleWidget *wi = fi.tryFindWidget(OP_CSTRING(0)); if (!wi || !is(wi)) return; FinaleAnimWidget &anim = wi->as(); @@ -2032,25 +2032,25 @@ DEFFC(EdgeColor) DEFFC(OffsetX) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); fi.page(FinaleInterpreter::Anims).setOffsetX(OP_FLOAT(0), fi.inTime()); } DEFFC(OffsetY) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); fi.page(FinaleInterpreter::Anims).setOffsetY(OP_FLOAT(0), fi.inTime()); } DEFFC(Sound) { - DENG2_UNUSED2(cmd, fi); + DE_UNUSED(cmd, fi); S_LocalSound(DED_Definitions()->getSoundNum(OP_CSTRING(0)), nullptr); } DEFFC(SoundAt) { - DENG2_UNUSED2(cmd, fi); + DE_UNUSED(cmd, fi); dint const soundId = DED_Definitions()->getSoundNum(OP_CSTRING(0)); dfloat const vol = de::min(OP_FLOAT(1), 1.f); S_LocalSoundAtVolume(soundId, nullptr, vol); @@ -2058,7 +2058,7 @@ DEFFC(SoundAt) DEFFC(SeeSound) { - DENG2_UNUSED2(cmd, fi); + DE_UNUSED(cmd, fi); dint num = DED_Definitions()->getMobjNum(OP_CSTRING(0)); if (num >= 0 && ::runtimeDefs.mobjInfo[num].seeSound > 0) { @@ -2068,7 +2068,7 @@ DEFFC(SeeSound) DEFFC(DieSound) { - DENG2_UNUSED2(cmd, fi); + DE_UNUSED(cmd, fi); dint num = DED_Definitions()->getMobjNum(OP_CSTRING(0)); if (num >= 0 && ::runtimeDefs.mobjInfo[num].deathSound > 0) { @@ -2078,25 +2078,25 @@ DEFFC(DieSound) DEFFC(Music) { - DENG2_UNUSED3(cmd, ops, fi); + DE_UNUSED(cmd, ops, fi); S_StartMusic(OP_CSTRING(0), true); } DEFFC(MusicOnce) { - DENG2_UNUSED3(cmd, ops, fi); + DE_UNUSED(cmd, ops, fi); S_StartMusic(OP_CSTRING(0), false); } DEFFC(Filter) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); fi.page(FinaleInterpreter::Texts).setFilterColorAndAlpha(Vec4f(OP_FLOAT(0), OP_FLOAT(1), OP_FLOAT(2), OP_FLOAT(3)), fi.inTime()); } DEFFC(Text) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleTextWidget &text = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)).as(); text.setText(OP_CSTRING(3)) @@ -2106,7 +2106,7 @@ DEFFC(Text) DEFFC(TextFromDef) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleTextWidget &text = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)).as(); int textIdx = DED_Definitions()->getTextNum((char *)OP_CSTRING(3)); @@ -2117,7 +2117,7 @@ DEFFC(TextFromDef) DEFFC(TextFromLump) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleTextWidget &text = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)).as(); text.setOrigin(Vec3f(OP_FLOAT(1), OP_FLOAT(2), 0)); @@ -2159,14 +2159,14 @@ DEFFC(TextFromLump) DEFFC(SetText) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleTextWidget &text = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)).as(); text.setText(OP_CSTRING(1)); } DEFFC(SetTextDef) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleTextWidget &text = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)).as(); int textIdx = DED_Definitions()->getTextNum((char *)OP_CSTRING(1)); @@ -2175,13 +2175,13 @@ DEFFC(SetTextDef) DEFFC(DeleteText) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); delete fi.tryFindWidget(OP_CSTRING(0)); } DEFFC(PredefinedColor) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); fi.page(FinaleInterpreter::Texts) .setPredefinedColor(de::clamp(1, OP_INT(0), FIPAGE_NUM_PREDEFINED_COLORS) - 1, Vec3f(OP_FLOAT(1), OP_FLOAT(2), OP_FLOAT(3)), fi.inTime()); @@ -2193,7 +2193,7 @@ DEFFC(PredefinedColor) DEFFC(PredefinedFont) { #ifdef __CLIENT__ - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); LOG_AS("FIC_PredefinedFont"); fontid_t const fontNum = Fonts_ResolveUri(OP_URI(1)); @@ -2208,76 +2208,76 @@ DEFFC(PredefinedFont) AutoStr *fontPath = Uri_ToString(OP_URI(1)); LOG_SCR_WARNING("Unknown font '%s'") << Str_Text(fontPath); #else - DENG2_UNUSED3(cmd, ops, fi); + DE_UNUSED(cmd, ops, fi); #endif } DEFFC(TextRGB) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleTextWidget &text = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)).as(); text.setColor(Vec3f(OP_FLOAT(1), OP_FLOAT(2), OP_FLOAT(3)), fi.inTime()); } DEFFC(TextAlpha) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleTextWidget &text = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)).as(); text.setAlpha(OP_FLOAT(1), fi.inTime()); } DEFFC(TextOffX) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleWidget &wi = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)); wi.setOriginX(OP_FLOAT(1), fi.inTime()); } DEFFC(TextOffY) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleWidget &wi = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)); wi.setOriginY(OP_FLOAT(1), fi.inTime()); } DEFFC(TextCenter) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleTextWidget &text = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)).as(); text.setAlignment(text.alignment() & ~(ALIGN_LEFT | ALIGN_RIGHT)); } DEFFC(TextNoCenter) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleTextWidget &text = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)).as(); text.setAlignment(text.alignment() | ALIGN_LEFT); } DEFFC(TextScroll) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleTextWidget &text = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)).as(); text.setScrollRate(OP_INT(1)); } DEFFC(TextPos) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleTextWidget &text = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)).as(); text.setCursorPos(OP_INT(1)); } DEFFC(TextRate) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleTextWidget &text = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)).as(); text.setTypeInRate(OP_INT(1)); } DEFFC(TextLineHeight) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleTextWidget &text = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)).as(); text.setLineHeight(OP_FLOAT(1)); } @@ -2285,7 +2285,7 @@ DEFFC(TextLineHeight) DEFFC(Font) { #ifdef __CLIENT__ - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); LOG_AS("FIC_Font"); FinaleTextWidget &text = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)).as(); @@ -2299,47 +2299,47 @@ DEFFC(Font) AutoStr *fontPath = Uri_ToString(OP_URI(1)); LOG_SCR_WARNING("Unknown font '%s'") << Str_Text(fontPath); #else - DENG2_UNUSED3(cmd, ops, fi); + DE_UNUSED(cmd, ops, fi); #endif } DEFFC(FontA) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleTextWidget &text = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)).as(); text.setFont(fi.page(FinaleInterpreter::Texts).predefinedFont(0)); } DEFFC(FontB) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleTextWidget &text = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)).as(); text.setFont(fi.page(FinaleInterpreter::Texts).predefinedFont(1)); } DEFFC(NoMusic) { - DENG2_UNUSED3(cmd, ops, fi); + DE_UNUSED(cmd, ops, fi); S_StopMusic(); } DEFFC(TextScaleX) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleWidget &wi = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)); wi.setScaleX(OP_FLOAT(1), fi.inTime()); } DEFFC(TextScaleY) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleWidget &wi = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)); wi.setScaleY(OP_FLOAT(1), fi.inTime()); } DEFFC(TextScale) { - DENG2_UNUSED(cmd); + DE_UNUSED(cmd); FinaleWidget &wi = fi.findOrCreateWidget(FI_TEXT, OP_CSTRING(0)); wi.setScaleX(OP_FLOAT(1), fi.inTime()) .setScaleY(OP_FLOAT(2), fi.inTime()); @@ -2359,24 +2359,24 @@ DEFFC(PlayDemo) fi.resume(); } #else - DENG2_UNUSED3(cmd, ops, fi); + DE_UNUSED(cmd, ops, fi); #endif } DEFFC(Command) { - DENG2_UNUSED2(cmd, fi); + DE_UNUSED(cmd, fi); Con_Executef(CMDS_SCRIPT, false, "%s", OP_CSTRING(0)); } DEFFC(ShowMenu) { - DENG2_UNUSED2(cmd, ops); + DE_UNUSED(cmd, ops); fi.setShowMenu(); } DEFFC(NoShowMenu) { - DENG2_UNUSED2(cmd, ops); + DE_UNUSED(cmd, ops); fi.setShowMenu(false); } diff --git a/doomsday/apps/client/src/ui/infine/finalepagewidget.cpp b/doomsday/apps/client/src/ui/infine/finalepagewidget.cpp index b0086bf70c..99c16b90b6 100644 --- a/doomsday/apps/client/src/ui/infine/finalepagewidget.cpp +++ b/doomsday/apps/client/src/ui/infine/finalepagewidget.cpp @@ -35,8 +35,8 @@ using namespace de; -DENG2_PIMPL_NOREF(FinalePageWidget) -, DENG2_OBSERVES(FinaleWidget, Deletion) +DE_PIMPL_NOREF(FinalePageWidget) +, DE_OBSERVES(FinaleWidget, Deletion) { struct Flags { char hidden:1; ///< Not drawn. @@ -79,12 +79,12 @@ DENG2_PIMPL_NOREF(FinalePageWidget) ~Impl() { qDeleteAll(children); - DENG2_ASSERT(children.isEmpty()); + DE_ASSERT(children.isEmpty()); } void finaleWidgetBeingDeleted(FinaleWidget const &widget) { - DENG2_ASSERT(children.contains(&const_cast(widget))); + DE_ASSERT(children.contains(&const_cast(widget))); children.removeOne(&const_cast(widget)); } }; @@ -157,7 +157,7 @@ void FinalePageWidget::draw() const // Clear Z buffer (prevent the objects being clipped by nearby polygons). LIBGUI_GL.glClear(GL_DEPTH_BUFFER_BIT); -#if defined (DENG_OPENGL) +#if defined (DE_OPENGL) if (renderWireframe > 1) { LIBGUI_GL.glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); @@ -179,7 +179,7 @@ void FinalePageWidget::draw() const // Restore original matrices and state: back to normal 2D. DGL_PopState(); -#if defined (DENG_OPENGL) +#if defined (DE_OPENGL) // Back from wireframe mode? if (renderWireframe > 1) { diff --git a/doomsday/apps/client/src/ui/infine/finaletextwidget.cpp b/doomsday/apps/client/src/ui/infine/finaletextwidget.cpp index b40b91e7ca..2e45f34878 100644 --- a/doomsday/apps/client/src/ui/infine/finaletextwidget.cpp +++ b/doomsday/apps/client/src/ui/infine/finaletextwidget.cpp @@ -35,7 +35,7 @@ using namespace de; -DENG2_PIMPL_NOREF(FinaleTextWidget) +DE_PIMPL_NOREF(FinaleTextWidget) { animatorvector4_t color; uint pageColor = 0; ///< 1-based page color index. @c 0= Use our own color. @@ -145,8 +145,8 @@ void FinaleTextWidget::draw(Vec3f const &offset) { if (!d->text) return; - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); DGL_MatrixMode(DGL_MODELVIEW); DGL_PushMatrix(); diff --git a/doomsday/apps/client/src/ui/infine/finalewidget.cpp b/doomsday/apps/client/src/ui/infine/finalewidget.cpp index 39cee6148a..0a727bec44 100644 --- a/doomsday/apps/client/src/ui/infine/finalewidget.cpp +++ b/doomsday/apps/client/src/ui/infine/finalewidget.cpp @@ -23,7 +23,7 @@ using namespace de; -DENG2_PIMPL_NOREF(FinaleWidget) +DE_PIMPL_NOREF(FinaleWidget) { Id id; String name; @@ -47,7 +47,7 @@ FinaleWidget::FinaleWidget(de::String const &name) : d(new Impl) FinaleWidget::~FinaleWidget() { - DENG2_FOR_AUDIENCE(Deletion, i) i->finaleWidgetBeingDeleted(*this); + DE_FOR_AUDIENCE(Deletion, i) i->finaleWidgetBeingDeleted(*this); } Id FinaleWidget::id() const diff --git a/doomsday/apps/client/src/ui/infine/infinesystem.cpp b/doomsday/apps/client/src/ui/infine/infinesystem.cpp index d5ae8d0057..caec7e6a85 100644 --- a/doomsday/apps/client/src/ui/infine/infinesystem.cpp +++ b/doomsday/apps/client/src/ui/infine/infinesystem.cpp @@ -17,7 +17,7 @@ * http://www.gnu.org/licenses */ -#define DENG_NO_API_MACROS_INFINE +#define DE_NO_API_MACROS_INFINE #include #include @@ -36,8 +36,8 @@ using namespace de; -DENG2_PIMPL_NOREF(InFineSystem) -, DENG2_OBSERVES(Finale, Deletion) +DE_PIMPL_NOREF(InFineSystem) +, DE_OBSERVES(Finale, Deletion) { Finales finales; @@ -283,7 +283,7 @@ int FI_ScriptFlags(finaleid_t id) #undef FI_ScriptResponder int FI_ScriptResponder(finaleid_t id, void const *ev) { - DENG2_ASSERT(ev); + DE_ASSERT(ev); LOG_AS("InFine.ScriptResponder"); if (App_InFineSystem().hasFinale(id)) { @@ -329,7 +329,7 @@ dd_bool FI_ScriptIsMenuTrigger(finaleid_t id) return false; } -DENG_DECLARE_API(Infine) = +DE_DECLARE_API(Infine) = { { DE_API_INFINE }, FI_Execute2, diff --git a/doomsday/apps/client/src/ui/inputdebug.cpp b/doomsday/apps/client/src/ui/inputdebug.cpp index 828fc42d53..5e58bb54fe 100644 --- a/doomsday/apps/client/src/ui/inputdebug.cpp +++ b/doomsday/apps/client/src/ui/inputdebug.cpp @@ -20,7 +20,7 @@ #include "de_platform.h" // strdup macro #include "ui/inputdebug.h" -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG #include #include @@ -128,7 +128,7 @@ static uchar modKey(int ddkey) if (shiftDown) { - DENG2_ASSERT(ddkey >= 0 && ddkey < MAX_KEYMAPPINGS); + DE_ASSERT(ddkey >= 0 && ddkey < MAX_KEYMAPPINGS); ddkey = shiftKeyMappings[ddkey]; } @@ -397,8 +397,8 @@ void Rend_RenderInputDeviceStateVisual(InputDevice &device, inputdev_layout_t co { #define SPACING 2 - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); if (retVisualDimensions) { @@ -764,8 +764,8 @@ void I_DebugDrawer() if (novideo || isDedicated) return; // Not for us. - DENG2_ASSERT_IN_RENDER_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_RENDER_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); // Disabled? if (!devRendKeyState && !devRendMouseState && !devRendJoyState) return; @@ -773,7 +773,7 @@ void I_DebugDrawer() DGL_MatrixMode(DGL_PROJECTION); DGL_PushMatrix(); DGL_LoadIdentity(); - DGL_Ortho(0, 0, DENG_GAMEVIEW_WIDTH, DENG_GAMEVIEW_HEIGHT, -1, 1); + DGL_Ortho(0, 0, DE_GAMEVIEW_WIDTH, DE_GAMEVIEW_HEIGHT, -1, 1); if (devRendKeyState) { @@ -806,4 +806,4 @@ void I_DebugDrawerConsoleRegister() C_VAR_BYTE("rend-dev-input-mouse-state", &devRendMouseState, CVF_NO_ARCHIVE, 0, 1); } -#endif // DENG2_DEBUG +#endif // DE_DEBUG diff --git a/doomsday/apps/client/src/ui/inputdevice.cpp b/doomsday/apps/client/src/ui/inputdevice.cpp index 7845c0bd73..a0c3a199a7 100644 --- a/doomsday/apps/client/src/ui/inputdevice.cpp +++ b/doomsday/apps/client/src/ui/inputdevice.cpp @@ -29,7 +29,7 @@ using namespace de; -DENG2_PIMPL(InputDevice) +DE_PIMPL(InputDevice) { bool active = false; ///< Initially inactive. String title; ///< Human-friendly title. @@ -48,14 +48,14 @@ DENG2_PIMPL(InputDevice) qDeleteAll(axes); } - DENG2_PIMPL_AUDIENCE(ActiveChange) + DE_PIMPL_AUDIENCE(ActiveChange) }; -DENG2_AUDIENCE_METHOD(InputDevice, ActiveChange) +DE_AUDIENCE_METHOD(InputDevice, ActiveChange) InputDevice::InputDevice(String const &name) : d(new Impl(this)) { - DENG2_ASSERT(!name.isEmpty()); + DE_ASSERT(!name.isEmpty()); d->name = name; } @@ -74,7 +74,7 @@ void InputDevice::activate(bool yes) d->active = yes; // Notify interested parties. - DENG2_FOR_AUDIENCE2(ActiveChange, i) i->inputDeviceActiveChanged(*this); + DE_FOR_AUDIENCE2(ActiveChange, i) i->inputDeviceActiveChanged(*this); } } @@ -293,7 +293,7 @@ void InputDevice::consoleRegister() //--------------------------------------------------------------------------------------- -DENG2_PIMPL_NOREF(InputDevice::Control) +DE_PIMPL_NOREF(InputDevice::Control) { String name; ///< Symbolic InputDevice *device = nullptr; @@ -312,19 +312,19 @@ InputDevice::Control::~Control() String InputDevice::Control::name() const { - DENG2_GUARD(this); + DE_GUARD(this); return d->name; } void InputDevice::Control::setName(String const &newName) { - DENG2_GUARD(this); + DE_GUARD(this); d->name = newName; } String InputDevice::Control::fullName() const { - DENG2_GUARD(this); + DE_GUARD(this); String desc; if (hasDevice()) desc += device().name() + "-"; desc += (d->name.isEmpty()? "" : d->name); @@ -333,7 +333,7 @@ String InputDevice::Control::fullName() const InputDevice &InputDevice::Control::device() const { - DENG2_GUARD(this); + DE_GUARD(this); if (d->device) return *d->device; /// @throw MissingDeviceError Missing InputDevice attribution. throw MissingDeviceError("InputDevice::Control::device", "No InputDevice is attributed"); @@ -341,43 +341,43 @@ InputDevice &InputDevice::Control::device() const bool InputDevice::Control::hasDevice() const { - DENG2_GUARD(this); + DE_GUARD(this); return d->device != nullptr; } void InputDevice::Control::setDevice(InputDevice *newDevice) { - DENG2_GUARD(this); + DE_GUARD(this); d->device = newDevice; } BindContext *InputDevice::Control::bindContext() const { - DENG2_GUARD(this); + DE_GUARD(this); return d->bindContext; } void InputDevice::Control::setBindContext(BindContext *newContext) { - DENG2_GUARD(this); + DE_GUARD(this); d->bindContext = newContext; } InputDevice::Control::BindContextAssociation InputDevice::Control::bindContextAssociation() const { - DENG2_GUARD(this); + DE_GUARD(this); return d->flags; } void InputDevice::Control::setBindContextAssociation(BindContextAssociation const &flagsToChange, FlagOp op) { - DENG2_GUARD(this); + DE_GUARD(this); applyFlagOperation(d->flags, flagsToChange, op); } void InputDevice::Control::clearBindContextAssociation() { - DENG2_GUARD(this); + DE_GUARD(this); d->prevBindContext = d->bindContext; d->bindContext = nullptr; applyFlagOperation(d->flags, Triggered, UnsetFlags); @@ -385,7 +385,7 @@ void InputDevice::Control::clearBindContextAssociation() void InputDevice::Control::expireBindContextAssociationIfChanged() { - DENG2_GUARD(this); + DE_GUARD(this); // No change? if (d->bindContext == d->prevBindContext) return; diff --git a/doomsday/apps/client/src/ui/inputsystem.cpp b/doomsday/apps/client/src/ui/inputsystem.cpp index b1953f1955..e49b6ca571 100644 --- a/doomsday/apps/client/src/ui/inputsystem.cpp +++ b/doomsday/apps/client/src/ui/inputsystem.cpp @@ -17,7 +17,7 @@ * http://www.gnu.org/licenses */ -#define DENG_NO_API_MACROS_BINDING +#define DE_NO_API_MACROS_BINDING #include "de_platform.h" // strdup macro #include "ui/inputsystem.h" @@ -243,10 +243,10 @@ static char *eventStrings[MAXEVENTS]; */ static char const *allocEventString(char const *str) { - DENG2_ASSERT(str); + DE_ASSERT(str); static int eventStringRover = 0; - DENG2_ASSERT(eventStringRover >= 0 && eventStringRover < MAXEVENTS); + DE_ASSERT(eventStringRover >= 0 && eventStringRover < MAXEVENTS); M_Free(eventStrings[eventStringRover]); char const *returnValue = eventStrings[eventStringRover] = strdup(str); @@ -279,7 +279,7 @@ struct eventqueue_t */ static ddevent_t *nextFromQueue(eventqueue_t *q) { - DENG2_ASSERT(q); + DE_ASSERT(q); if (q->head == q->tail) return nullptr; @@ -292,13 +292,13 @@ static ddevent_t *nextFromQueue(eventqueue_t *q) static void clearQueue(eventqueue_t *q) { - DENG2_ASSERT(q); + DE_ASSERT(q); q->head = q->tail; } static void postToQueue(eventqueue_t *q, ddevent_t *ev) { - DENG2_ASSERT(q && ev); + DE_ASSERT(q && ev); q->events[q->head] = *ev; if (ev->type == E_SYMBOLIC) @@ -316,10 +316,10 @@ static eventqueue_t sharpQueue; static byte useSharpInputEvents = true; ///< cvar -DENG2_PIMPL(InputSystem) -, DENG2_OBSERVES(BindContext, ActiveChange) -, DENG2_OBSERVES(BindContext, AcquireDeviceChange) -, DENG2_OBSERVES(BindContext, BindingAddition) +DE_PIMPL(InputSystem) +, DE_OBSERVES(BindContext, ActiveChange) +, DE_OBSERVES(BindContext, AcquireDeviceChange) +, DE_OBSERVES(BindContext, BindingAddition) { bool ignoreInput = false; @@ -347,8 +347,8 @@ DENG2_PIMPL(InputSystem) // Initialize script bindings. binder.initNew() - << DENG2_FUNC(InputSystem_BindEvent, "bindEvent", "event" << "command") - << DENG2_FUNC(InputSystem_BindControl, "bindControl", "control" << "impulse"); + << DE_FUNC(InputSystem_BindEvent, "bindEvent", "event" << "command") + << DE_FUNC(InputSystem_BindControl, "bindControl", "control" << "impulse"); binder.module().addNumber("DEFAULT_STICK_DEADZONE", DEFAULT_STICK_DEADZONE).setReadOnly(); binder.module().addNumber("DEFAULT_STICK_FACTOR", DEFAULT_STICK_FACTOR).setReadOnly(); @@ -404,7 +404,7 @@ DENG2_PIMPL(InputSystem) void echoSymbolicEvent(ddevent_t const &ev) { - DENG2_ASSERT(symbolicEchoMode); + DE_ASSERT(symbolicEchoMode); // Some event types are never echoed. if (ev.type == E_SYMBOLIC || ev.type == E_FOCUS) return; @@ -559,7 +559,7 @@ DENG2_PIMPL(InputSystem) ev.toggle.id = ke->ddkey; // Text content to insert? - DENG2_ASSERT(sizeof(ev.toggle.text) == sizeof(ke->text)); + DE_ASSERT(sizeof(ev.toggle.text) == sizeof(ke->text)); std::memcpy(ev.toggle.text, ke->text, sizeof(ev.toggle.text)); LOG_INPUT_XVERBOSE("toggle.id: %i/%c [%s:%u] (state:%i)", @@ -841,7 +841,7 @@ DENG2_PIMPL(InputSystem) case E_SYMBOLIC: break; default: - DENG2_ASSERT_FAIL("InputSystem::updateAllDeviceStateAssociations: Invalid bind.type"); + DE_ASSERT_FAIL("InputSystem::updateAllDeviceStateAssociations: Invalid bind.type"); break; } @@ -868,7 +868,7 @@ DENG2_PIMPL(InputSystem) case IBD_ANGLE: ctrl = &dev.hat (bind.controlId); break; default: - DENG2_ASSERT_FAIL("InputSystem::updateAllDeviceStateAssociations: Invalid bind.type"); + DE_ASSERT_FAIL("InputSystem::updateAllDeviceStateAssociations: Invalid bind.type"); break; } @@ -1072,7 +1072,7 @@ void InputSystem::clearEvents() /// @note Called by the I/O functions when input is detected. void InputSystem::postEvent(ddevent_t *ev) { - DENG2_ASSERT(ev);// && ev->device < NUM_INPUT_DEVICES); + DE_ASSERT(ev);// && ev->device < NUM_INPUT_DEVICES); eventqueue_t *q = &queue; if (useSharpInputEvents && @@ -1312,7 +1312,7 @@ bool InputSystem::convertEvent(ddevent_t const &from, event_t &to) // static return false; default: - DENG2_ASSERT_FAIL("InputSystem::convertEvent: Unknown device ID in ddevent_t"); + DE_ASSERT_FAIL("InputSystem::convertEvent: Unknown device ID in ddevent_t"); return false; } } @@ -1458,7 +1458,7 @@ void InputSystem::bindGameDefaults() static char const *parseContext(String &context, char const *desc) { - DENG2_ASSERT(desc); + DE_ASSERT(desc); if (!strchr(desc, ':')) { @@ -1476,7 +1476,7 @@ static char const *parseContext(String &context, char const *desc) Record *InputSystem::bindCommand(char const *eventDesc, char const *command) { - DENG2_ASSERT(eventDesc && command); + DE_ASSERT(eventDesc && command); LOG_AS("InputSystem"); // The event descriptor may begin with a symbolic binding context name. @@ -1492,7 +1492,7 @@ Record *InputSystem::bindCommand(char const *eventDesc, char const *command) Record *InputSystem::bindImpulse(char const *ctrlDesc, char const *impulseDesc) { - DENG2_ASSERT(ctrlDesc && impulseDesc); + DE_ASSERT(ctrlDesc && impulseDesc); LOG_AS("InputSystem"); // The impulse descriptor may begin with the local player number. @@ -1526,7 +1526,7 @@ Record *InputSystem::bindImpulse(char const *ctrlDesc, char const *impulseDesc) { context = contextPtr(DEFAULT_BINDING_CONTEXT_NAME); } - DENG2_ASSERT(context); + DE_ASSERT(context); return context->bindImpulse(ctrlDesc, *impulse, localPlayer); } @@ -1562,7 +1562,7 @@ void InputSystem::removeBindingsForDevice(int deviceId) D_CMD(ListDevices) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); InputSystem &isys = ClientApp::inputSystem(); LOG_INPUT_MSG(_E(b) "%i input devices initalized:") << isys.deviceCount(); @@ -1576,7 +1576,7 @@ D_CMD(ListDevices) D_CMD(InspectDevice) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); if (InputDevice const *device = ClientApp::inputSystem().findDevice(argv[1])) { LOG_INPUT_MSG("") << device->description(); @@ -1590,7 +1590,7 @@ D_CMD(InspectDevice) D_CMD(ReleaseMouse) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); if (WindowSystem::mainExists()) { ClientWindowSystem::main().eventHandler().trapMouse(false); @@ -1601,7 +1601,7 @@ D_CMD(ReleaseMouse) D_CMD(ListContexts) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); InputSystem &isys = ClientApp::inputSystem(); LOG_INPUT_MSG(_E(b) "%i binding contexts defined:") << isys.contextCount(); @@ -1627,7 +1627,7 @@ D_CMD(ClearContexts) D_CMD(ActivateContext) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); InputSystem &isys = ClientApp::inputSystem(); bool const doActivate = !String(argv[0]).compareWithoutCase("activatebcontext"); @@ -1654,19 +1654,19 @@ D_CMD(ActivateContext) D_CMD(BindCommand) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); return ClientApp::inputSystem().bindCommand(argv[1], argv[2]) != nullptr; } D_CMD(BindImpulse) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); return ClientApp::inputSystem().bindImpulse(argv[2], argv[1]) != nullptr; } D_CMD(ListBindings) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); InputSystem &isys = ClientApp::inputSystem(); int totalBindCount = 0; @@ -1716,7 +1716,7 @@ D_CMD(ListBindings) { ImpulseBinding bind(rec); PlayerImpulse const *impulse = P_PlayerImpulsePtr(bind.geti("impulseId")); - DENG2_ASSERT(impulse); + DE_ASSERT(impulse); LOG_INPUT_MSG(" [%3i] " _E(>) _E(b) "%s" _E(.) " player%i %s") << bind.geti("id") << bind.composeDescriptor() << (pl + 1) << impulse->name; @@ -1732,14 +1732,14 @@ D_CMD(ListBindings) D_CMD(ClearBindings) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); ClientApp::inputSystem().removeAllBindings(); return true; } D_CMD(RemoveBinding) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); int const id = String(argv[1]).toInt(); if (ClientApp::inputSystem().removeBinding(id)) @@ -1756,7 +1756,7 @@ D_CMD(RemoveBinding) D_CMD(DefaultBindings) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); InputSystem &isys = ClientApp::inputSystem(); isys.bindDefaults(); isys.bindGameDefaults(); @@ -1790,7 +1790,7 @@ void InputSystem::consoleRegister() // static //C_CMD_FLAGS("setaxis", "ss", AxisChangeOption, CMDF_NO_DEDICATED); //C_CMD_FLAGS("setaxis", "sss", AxisChangeValue, CMDF_NO_DEDICATED); -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG I_DebugDrawerConsoleRegister(); #endif @@ -1798,7 +1798,7 @@ void InputSystem::consoleRegister() // static } #undef B_SetContextFallback -DENG_EXTERN_C void B_SetContextFallback(char const *name, int (*responderFunc)(event_t *)) +DE_EXTERN_C void B_SetContextFallback(char const *name, int (*responderFunc)(event_t *)) { InputSystem &isys = ClientApp::inputSystem(); if (isys.hasContext(name)) @@ -1808,9 +1808,9 @@ DENG_EXTERN_C void B_SetContextFallback(char const *name, int (*responderFunc)(e } #undef B_BindingsForCommand -DENG_EXTERN_C int B_BindingsForCommand(char const *commandCString, char *outBuf, size_t outBufSize) +DE_EXTERN_C int B_BindingsForCommand(char const *commandCString, char *outBuf, size_t outBufSize) { - DENG2_ASSERT(commandCString && outBuf); + DE_ASSERT(commandCString && outBuf); String const command = commandCString; *outBuf = 0; @@ -1847,10 +1847,10 @@ DENG_EXTERN_C int B_BindingsForCommand(char const *commandCString, char *outBuf, } #undef B_BindingsForControl -DENG_EXTERN_C int B_BindingsForControl(int localPlayer, char const *impulseNameCString, int inverse, +DE_EXTERN_C int B_BindingsForControl(int localPlayer, char const *impulseNameCString, int inverse, char *outBuf, size_t outBufSize) { - DENG2_ASSERT(impulseNameCString && outBuf); + DE_ASSERT(impulseNameCString && outBuf); String const impulseName = impulseNameCString; *outBuf = 0; @@ -1868,10 +1868,10 @@ DENG_EXTERN_C int B_BindingsForControl(int localPlayer, char const *impulseNameC context.forAllImpulseBindings(localPlayer, [&] (CompiledImpulseBindingRecord &rec) { auto const &bind = rec.compiled(); - DENG2_ASSERT(bind.localPlayer == localPlayer); + DE_ASSERT(bind.localPlayer == localPlayer); PlayerImpulse const *impulse = P_PlayerImpulsePtr(bind.impulseId); - DENG2_ASSERT(impulse); + DE_ASSERT(impulse); if (!impulse->name.compareWithoutCase(impulseName)) { @@ -1899,14 +1899,14 @@ DENG_EXTERN_C int B_BindingsForControl(int localPlayer, char const *impulseNameC } #undef DD_GetKeyCode -DENG_EXTERN_C int DD_GetKeyCode(char const *key) +DE_EXTERN_C int DD_GetKeyCode(char const *key) { - DENG2_ASSERT(key); + DE_ASSERT(key); int code = B_KeyForShortName(key); return (code? code : key[0]); } -DENG_DECLARE_API(B) = +DE_DECLARE_API(B) = { { DE_API_BINDING }, B_SetContextFallback, diff --git a/doomsday/apps/client/src/ui/mouse_qt.cpp b/doomsday/apps/client/src/ui/mouse_qt.cpp index 4fce55038b..c92b938e41 100644 --- a/doomsday/apps/client/src/ui/mouse_qt.cpp +++ b/doomsday/apps/client/src/ui/mouse_qt.cpp @@ -68,7 +68,7 @@ static void Mouse_Qt_Poll() { if (!mouseTrapped) return; -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) ClientWindow *win = ClientWindowSystem::mainPtr(); if (!win) return; // Hmm? @@ -147,7 +147,7 @@ static void Mouse_Qt_ShowCursor(bool yes) static void Mouse_Qt_InitTrap() { -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) auto &window = ClientWindowSystem::main(); QCursor::setPos(window.mapToGlobal(window.geometry().center())); @@ -160,7 +160,7 @@ static void Mouse_Qt_InitTrap() static void Mouse_Qt_DeinitTrap() { -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) auto &window = ClientWindowSystem::main(); window.setMouseGrabEnabled(false); window.setKeyboardGrabEnabled(false); diff --git a/doomsday/apps/client/src/ui/nativemenu.cpp b/doomsday/apps/client/src/ui/nativemenu.cpp index fee4029cea..9cab0305f5 100644 --- a/doomsday/apps/client/src/ui/nativemenu.cpp +++ b/doomsday/apps/client/src/ui/nativemenu.cpp @@ -29,8 +29,8 @@ using namespace de; -DENG2_PIMPL(NativeMenu) -, DENG2_OBSERVES(Games, Readiness) +DE_PIMPL(NativeMenu) +, DE_OBSERVES(Games, Readiness) { QMenuBar *menuBar = nullptr; QMenu *helpMenu = nullptr; diff --git a/doomsday/apps/client/src/ui/postprocessing.cpp b/doomsday/apps/client/src/ui/postprocessing.cpp index 743d236827..6e60ed4b58 100644 --- a/doomsday/apps/client/src/ui/postprocessing.cpp +++ b/doomsday/apps/client/src/ui/postprocessing.cpp @@ -34,7 +34,7 @@ using namespace de; D_CMD(PostFx); -DENG2_PIMPL(PostProcessing) +DE_PIMPL(PostProcessing) { enum { PassThroughProgram = 0, ActiveProgram = 1 }; @@ -64,7 +64,7 @@ DENG2_PIMPL(PostProcessing) ~Impl() { - DENG2_ASSERT(!frame.isReady()); // deinited earlier + DE_ASSERT(!frame.isReady()); // deinited earlier } void attachUniforms(GLProgram &program) @@ -220,7 +220,7 @@ void PostProcessing::consoleRegister() // static D_CMD(PostFx) { - DENG2_UNUSED(src); + DE_UNUSED(src); int console = String(argv[1]).toInt(); String const shader = argv[2]; diff --git a/doomsday/apps/client/src/ui/savelistdata.cpp b/doomsday/apps/client/src/ui/savelistdata.cpp index 9c70f7a07f..5887f7023c 100644 --- a/doomsday/apps/client/src/ui/savelistdata.cpp +++ b/doomsday/apps/client/src/ui/savelistdata.cpp @@ -26,9 +26,9 @@ using namespace de; -DENG2_PIMPL(SaveListData) -, DENG2_OBSERVES(FileIndex, Addition) -, DENG2_OBSERVES(FileIndex, Removal) +DE_PIMPL(SaveListData) +, DE_OBSERVES(FileIndex, Addition) +, DE_OBSERVES(FileIndex, Removal) { LoopCallback mainCall; diff --git a/doomsday/apps/client/src/ui/styledlogsinkformatter.cpp b/doomsday/apps/client/src/ui/styledlogsinkformatter.cpp index 8984120a7b..3e07149889 100644 --- a/doomsday/apps/client/src/ui/styledlogsinkformatter.cpp +++ b/doomsday/apps/client/src/ui/styledlogsinkformatter.cpp @@ -26,8 +26,8 @@ using namespace de; static char const *VAR_METADATA = "log.showMetadata"; -DENG2_PIMPL(StyledLogSinkFormatter) -, DENG2_OBSERVES(Variable, Change) +DE_PIMPL(StyledLogSinkFormatter) +, DE_OBSERVES(Variable, Change) { LogEntry::Flags format; bool observe; diff --git a/doomsday/apps/client/src/ui/sys_input.cpp b/doomsday/apps/client/src/ui/sys_input.cpp index 6945f87acd..a64b4cea04 100644 --- a/doomsday/apps/client/src/ui/sys_input.cpp +++ b/doomsday/apps/client/src/ui/sys_input.cpp @@ -81,7 +81,7 @@ static void Mouse_Init(void) LOG_AS("Mouse_Init"); - DENG_ASSERT(iMouse); + DE_ASSERT(iMouse); iMouse->init(); // Init was successful. diff --git a/doomsday/apps/client/src/ui/ui_main.cpp b/doomsday/apps/client/src/ui/ui_main.cpp index 766ba95cba..dde4e53b55 100644 --- a/doomsday/apps/client/src/ui/ui_main.cpp +++ b/doomsday/apps/client/src/ui/ui_main.cpp @@ -50,14 +50,14 @@ static ui_color_t ui_colors[NUM_UI_COLORS] = { char const *UI_ChooseFixedFont() { - if (DENG_GAMEVIEW_WIDTH < 300) return "console11"; - if (DENG_GAMEVIEW_WIDTH > 768) return "console18"; + if (DE_GAMEVIEW_WIDTH < 300) return "console11"; + if (DE_GAMEVIEW_WIDTH > 768) return "console18"; return "console14"; } static AbstractFont *loadSystemFont(char const *name) { - DENG2_ASSERT(name != 0 && name[0]); + DE_ASSERT(name != 0 && name[0]); // Compose the resource name. de::Uri uri = de::makeUri("System:").setPath(name); diff --git a/doomsday/apps/client/src/ui/viewcompositor.cpp b/doomsday/apps/client/src/ui/viewcompositor.cpp index 2d667ce267..fac478bc4c 100644 --- a/doomsday/apps/client/src/ui/viewcompositor.cpp +++ b/doomsday/apps/client/src/ui/viewcompositor.cpp @@ -45,8 +45,8 @@ using namespace de; static Ranged const FACTOR_RANGE(1.0 / 16.0, 1.0); -DENG2_PIMPL(ViewCompositor) -, DENG2_OBSERVES(Variable, Change) +DE_PIMPL(ViewCompositor) +, DE_OBSERVES(Variable, Change) { mutable Variable const *pixelDensity = nullptr; mutable Variable const *resizeFactor = nullptr; @@ -294,7 +294,7 @@ void ViewCompositor::drawCompositedLayers() GL_ConfigureBorderedProjection(&bp, BPF_OVERDRAW_CLIP | (!App_World().hasMap()? BPF_OVERDRAW_MASK : 0), SCREENWIDTH, SCREENHEIGHT, - DENG_GAMEVIEW_WIDTH, DENG_GAMEVIEW_HEIGHT, + DE_GAMEVIEW_WIDTH, DE_GAMEVIEW_HEIGHT, scalemode_t(Con_GetByte("rend-finale-stretch"))); GL_BeginBorderedProjection(&bp); for (Finale *finale : App_InFineSystem().finales()) diff --git a/doomsday/apps/client/src/ui/widgets/busywidget.cpp b/doomsday/apps/client/src/ui/widgets/busywidget.cpp index f5005307e7..b3b1b827df 100644 --- a/doomsday/apps/client/src/ui/widgets/busywidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/busywidget.cpp @@ -34,7 +34,7 @@ using namespace de; -DENG_GUI_PIMPL(BusyWidget) +DE_GUI_PIMPL(BusyWidget) { typedef DefaultVertexBuf VertexBuf; @@ -178,9 +178,9 @@ void BusyWidget::renderTransitionFrame() // We'll have an up-to-date frame after this. d->frameDrawnAt = Time(); - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); - DENG2_ASSERT(d->gameWidget); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT(d->gameWidget); Rectanglei grabRect = Rectanglei::fromSize(rule().recti().size()); diff --git a/doomsday/apps/client/src/ui/widgets/consolecommandwidget.cpp b/doomsday/apps/client/src/ui/widgets/consolecommandwidget.cpp index 2bd6289999..fe2b39195c 100644 --- a/doomsday/apps/client/src/ui/widgets/consolecommandwidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/consolecommandwidget.cpp @@ -29,9 +29,9 @@ using namespace de; -DENG_GUI_PIMPL(ConsoleCommandWidget), -DENG2_OBSERVES(App, StartupComplete), -DENG2_OBSERVES(DoomsdayApp, GameChange) +DE_GUI_PIMPL(ConsoleCommandWidget), +DE_OBSERVES(App, StartupComplete), +DE_OBSERVES(DoomsdayApp, GameChange) { Impl(Public *i) : Base(i) { diff --git a/doomsday/apps/client/src/ui/widgets/consolewidget.cpp b/doomsday/apps/client/src/ui/widgets/consolewidget.cpp index d349cfc7b3..9f2541367e 100644 --- a/doomsday/apps/client/src/ui/widgets/consolewidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/consolewidget.cpp @@ -43,7 +43,7 @@ #include #include -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) # include # include # include @@ -53,9 +53,9 @@ using namespace de; static TimeSpan const LOG_OPEN_CLOSE_SPAN = 0.2; -DENG_GUI_PIMPL(ConsoleWidget) -, DENG2_OBSERVES(Variable, Change) -, DENG2_OBSERVES(DoomsdayApp, GameChange) +DE_GUI_PIMPL(ConsoleWidget) +, DE_OBSERVES(Variable, Change) +, DE_OBSERVES(DoomsdayApp, GameChange) { GuiWidget *buttons = nullptr; PopupButtonWidget *button = nullptr; @@ -160,7 +160,7 @@ DENG_GUI_PIMPL(ConsoleWidget) if (grabHover != RightEdge) { grabHover = RightEdge; -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) self().root().window().setCursor(Qt::SizeHorCursor); #endif } @@ -175,7 +175,7 @@ DENG_GUI_PIMPL(ConsoleWidget) if (grabHover != TopEdge) { grabHover = TopEdge; -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) self().root().window().setCursor(Qt::SizeVerCursor); #endif } @@ -183,7 +183,7 @@ DENG_GUI_PIMPL(ConsoleWidget) else if (grabHover != NotGrabbed) { grabHover = NotGrabbed; -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) self().root().window().setCursor(Qt::ArrowCursor); #endif } @@ -645,7 +645,7 @@ void ConsoleWidget::commandWasEntered(String const &) } } -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) void ConsoleWidget::copyLogPathToClipboard() { if (NativeFile *native = App::rootFolder().tryLocate(LogBuffer::get().outputFile())) diff --git a/doomsday/apps/client/src/ui/widgets/cvarchoicewidget.cpp b/doomsday/apps/client/src/ui/widgets/cvarchoicewidget.cpp index 9ebc96af88..619d82446f 100644 --- a/doomsday/apps/client/src/ui/widgets/cvarchoicewidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/cvarchoicewidget.cpp @@ -22,14 +22,14 @@ using namespace de; using namespace de::ui; -DENG2_PIMPL_NOREF(CVarChoiceWidget) +DE_PIMPL_NOREF(CVarChoiceWidget) { char const *cvar; cvar_t *var() const { cvar_t *cv = Con_FindVariable(cvar); - DENG2_ASSERT(cv != 0); + DE_ASSERT(cv != 0); return cv; } }; diff --git a/doomsday/apps/client/src/ui/widgets/cvarlineeditwidget.cpp b/doomsday/apps/client/src/ui/widgets/cvarlineeditwidget.cpp index d5374f4f36..cc9ad315e7 100644 --- a/doomsday/apps/client/src/ui/widgets/cvarlineeditwidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/cvarlineeditwidget.cpp @@ -22,14 +22,14 @@ using namespace de; using namespace de::ui; -DENG2_PIMPL_NOREF(CVarLineEditWidget) +DE_PIMPL_NOREF(CVarLineEditWidget) { char const *cvar; cvar_t *var() const { cvar_t *cv = Con_FindVariable(cvar); - DENG2_ASSERT(cv != 0); + DE_ASSERT(cv != 0); return cv; } }; diff --git a/doomsday/apps/client/src/ui/widgets/cvarnativepathwidget.cpp b/doomsday/apps/client/src/ui/widgets/cvarnativepathwidget.cpp index c9abd48049..14ed51532b 100644 --- a/doomsday/apps/client/src/ui/widgets/cvarnativepathwidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/cvarnativepathwidget.cpp @@ -27,7 +27,7 @@ using namespace de; -DENG2_PIMPL(CVarNativePathWidget) +DE_PIMPL(CVarNativePathWidget) , DENG2_OBSERVES(NativePathWidget, UserChange) { char const *cvar; @@ -38,7 +38,7 @@ DENG2_PIMPL(CVarNativePathWidget) cvar_t *var() const { cvar_t *cv = Con_FindVariable(cvar); - DENG2_ASSERT(cv != 0); + DE_ASSERT(cv != 0); return cv; } diff --git a/doomsday/apps/client/src/ui/widgets/cvarsliderwidget.cpp b/doomsday/apps/client/src/ui/widgets/cvarsliderwidget.cpp index 2c3a424c00..a1744875dc 100644 --- a/doomsday/apps/client/src/ui/widgets/cvarsliderwidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/cvarsliderwidget.cpp @@ -22,14 +22,14 @@ using namespace de; using namespace de::ui; -DENG2_PIMPL_NOREF(CVarSliderWidget) +DE_PIMPL_NOREF(CVarSliderWidget) { char const *cvar; cvar_t *var() const { cvar_t *cv = Con_FindVariable(cvar); - DENG2_ASSERT(cv != 0); + DE_ASSERT(cv != 0); return cv; } }; diff --git a/doomsday/apps/client/src/ui/widgets/cvartogglewidget.cpp b/doomsday/apps/client/src/ui/widgets/cvartogglewidget.cpp index 3e566139b5..b2cf78d30e 100644 --- a/doomsday/apps/client/src/ui/widgets/cvartogglewidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/cvartogglewidget.cpp @@ -22,14 +22,14 @@ using namespace de; using namespace de::ui; -DENG2_PIMPL_NOREF(CVarToggleWidget) +DE_PIMPL_NOREF(CVarToggleWidget) { char const *cvar; cvar_t *var() const { cvar_t *cv = Con_FindVariable(cvar); - DENG2_ASSERT(cv != 0); + DE_ASSERT(cv != 0); return cv; } }; diff --git a/doomsday/apps/client/src/ui/widgets/gamewidget.cpp b/doomsday/apps/client/src/ui/widgets/gamewidget.cpp index 707dd1ff4a..b223ba828f 100644 --- a/doomsday/apps/client/src/ui/widgets/gamewidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/gamewidget.cpp @@ -67,7 +67,7 @@ using namespace de; -DENG2_PIMPL(GameWidget) +DE_PIMPL(GameWidget) { bool needFrames = true; // Rendering a new frame is necessary. VRConfig::Eye lastFrameEye = VRConfig::NeitherEye; @@ -392,7 +392,7 @@ void GameWidget::glDeinit() D_CMD(CubeShot) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); int size = String(argv[1]).toInt(); if (size < 8) return false; diff --git a/doomsday/apps/client/src/ui/widgets/homeitemwidget.cpp b/doomsday/apps/client/src/ui/widgets/homeitemwidget.cpp index 2998a5eb16..89d341a4f3 100644 --- a/doomsday/apps/client/src/ui/widgets/homeitemwidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/homeitemwidget.cpp @@ -27,8 +27,8 @@ using namespace de; -DENG_GUI_PIMPL(HomeItemWidget) -, DENG2_OBSERVES(MenuWidget, ItemTriggered) +DE_GUI_PIMPL(HomeItemWidget) +, DE_OBSERVES(MenuWidget, ItemTriggered) { // Event handler for mouse clicks on the item. struct ClickHandler : public GuiWidget::IEventHandler @@ -304,7 +304,7 @@ AssetGroup &HomeItemWidget::assets() LabelWidget &HomeItemWidget::icon() { - DENG2_ASSERT(d->icon); + DE_ASSERT(d->icon); return *d->icon; } diff --git a/doomsday/apps/client/src/ui/widgets/homemenuwidget.cpp b/doomsday/apps/client/src/ui/widgets/homemenuwidget.cpp index e1cdf7f5f4..0918ff4988 100644 --- a/doomsday/apps/client/src/ui/widgets/homemenuwidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/homemenuwidget.cpp @@ -24,9 +24,9 @@ using namespace de; -DENG_GUI_PIMPL(HomeMenuWidget) -, DENG2_OBSERVES(ChildWidgetOrganizer, WidgetCreation) -, DENG2_OBSERVES(Asset, StateChange) +DE_GUI_PIMPL(HomeMenuWidget) +, DE_OBSERVES(ChildWidgetOrganizer, WidgetCreation) +, DE_OBSERVES(Asset, StateChange) { ui::DataPos selectedIndex = ui::Data::InvalidPos; ui::DataPos previousSelectedIndex = 0; @@ -124,7 +124,7 @@ const ui::Item *HomeMenuWidget::selectedItem() const void HomeMenuWidget::setSelectedIndex(ui::DataPos index) { - DENG2_ASSERT(hasRoot()); + DE_ASSERT(hasRoot()); if (auto *widget = itemWidget(index)) { diff --git a/doomsday/apps/client/src/ui/widgets/inputbindingwidget.cpp b/doomsday/apps/client/src/ui/widgets/inputbindingwidget.cpp index a8ec8cbcd2..034fd11eff 100644 --- a/doomsday/apps/client/src/ui/widgets/inputbindingwidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/inputbindingwidget.cpp @@ -31,14 +31,14 @@ using namespace de; #ifdef MACOSX # define CONTROL_MOD KeyEvent::Meta -# define CONTROL_CHAR DENG2_CHAR_MAC_CONTROL_KEY +# define CONTROL_CHAR DE_CHAR_MAC_CONTROL_KEY #else # define CONTROL_MOD KeyEvent::Control -# define CONTROL_CHAR DENG2_CHAR_CONTROL_KEY +# define CONTROL_CHAR DE_CHAR_CONTROL_KEY #endif -DENG_GUI_PIMPL(InputBindingWidget) -, DENG2_OBSERVES(ButtonWidget, Press) +DE_GUI_PIMPL(InputBindingWidget) +, DE_OBSERVES(ButtonWidget, Press) { String defaultEvent; String command; @@ -74,7 +74,7 @@ DENG_GUI_PIMPL(InputBindingWidget) String const conds = eventDesc.mid(idx + 1); if (conds.contains("key-alt-down")) { - name = String(DENG2_CHAR_ALT_KEY) + name; + name = String(DE_CHAR_ALT_KEY) + name; } if (conds.contains("key-ctrl-down") || conds.contains("key-control-down")) { @@ -82,7 +82,7 @@ DENG_GUI_PIMPL(InputBindingWidget) } if (conds.contains("key-shift-down")) { - name = String(DENG2_CHAR_SHIFT_KEY) + name; + name = String(DE_CHAR_SHIFT_KEY) + name; } } return name; diff --git a/doomsday/apps/client/src/ui/widgets/keygrabberwidget.cpp b/doomsday/apps/client/src/ui/widgets/keygrabberwidget.cpp index 3f7384c2f0..b00f1f6a8e 100644 --- a/doomsday/apps/client/src/ui/widgets/keygrabberwidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/keygrabberwidget.cpp @@ -28,7 +28,7 @@ using namespace de; using namespace de::ui; -DENG_GUI_PIMPL(KeyGrabberWidget) +DE_GUI_PIMPL(KeyGrabberWidget) { Impl(Public *i) : Base(i) {} diff --git a/doomsday/apps/client/src/ui/widgets/mapoutlinewidget.cpp b/doomsday/apps/client/src/ui/widgets/mapoutlinewidget.cpp index 4274637865..eab1914ab9 100644 --- a/doomsday/apps/client/src/ui/widgets/mapoutlinewidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/mapoutlinewidget.cpp @@ -23,7 +23,7 @@ using namespace de; -DENG_GUI_PIMPL(MapOutlineWidget) +DE_GUI_PIMPL(MapOutlineWidget) { ProgressWidget *progress; // shown initially, before outline received @@ -112,7 +112,7 @@ DENG_GUI_PIMPL(MapOutlineWidget) Mat4f modelMatrix() const { - DENG2_ASSERT(vbuf); + DE_ASSERT(vbuf); if (mapBounds.isNull()) return Mat4f(); diff --git a/doomsday/apps/client/src/ui/widgets/multiplayerservermenuwidget.cpp b/doomsday/apps/client/src/ui/widgets/multiplayerservermenuwidget.cpp index edf61cb9c3..347f35d458 100644 --- a/doomsday/apps/client/src/ui/widgets/multiplayerservermenuwidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/multiplayerservermenuwidget.cpp @@ -28,11 +28,11 @@ using namespace de; -DENG2_PIMPL(MultiplayerServerMenuWidget) -, DENG2_OBSERVES(DoomsdayApp, GameChange) -, DENG2_OBSERVES(Games, Readiness) -, DENG2_OBSERVES(ServerLink, DiscoveryUpdate) -, DENG2_OBSERVES(MultiplayerPanelButtonWidget, AboutToJoin) +DE_PIMPL(MultiplayerServerMenuWidget) +, DE_OBSERVES(DoomsdayApp, GameChange) +, DE_OBSERVES(Games, Readiness) +, DE_OBSERVES(ServerLink, DiscoveryUpdate) +, DE_OBSERVES(MultiplayerPanelButtonWidget, AboutToJoin) , public ChildWidgetOrganizer::IWidgetFactory { static ServerLink &link() { return ClientApp::serverLink(); } @@ -218,7 +218,7 @@ DENG2_PIMPL(MultiplayerServerMenuWidget) void aboutToJoinMultiplayerGame(shell::ServerInfo const &sv) override { - DENG2_FOR_PUBLIC_AUDIENCE2(AboutToJoin, i) i->aboutToJoinMultiplayerGame(sv); + DE_FOR_PUBLIC_AUDIENCE2(AboutToJoin, i) i->aboutToJoinMultiplayerGame(sv); } //- ChildWidgetOrganizer::IWidgetFactory -------------------------------------- @@ -241,10 +241,10 @@ DENG2_PIMPL(MultiplayerServerMenuWidget) updateAvailability(widget); } - DENG2_PIMPL_AUDIENCE(AboutToJoin) + DE_PIMPL_AUDIENCE(AboutToJoin) }; -DENG2_AUDIENCE_METHOD(MultiplayerServerMenuWidget, AboutToJoin); +DE_AUDIENCE_METHOD(MultiplayerServerMenuWidget, AboutToJoin); MultiplayerServerMenuWidget::MultiplayerServerMenuWidget(DiscoveryMode discovery, String const &name) diff --git a/doomsday/apps/client/src/ui/widgets/multiplayerstatuswidget.cpp b/doomsday/apps/client/src/ui/widgets/multiplayerstatuswidget.cpp index e55a26476d..b0d73fb8eb 100644 --- a/doomsday/apps/client/src/ui/widgets/multiplayerstatuswidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/multiplayerstatuswidget.cpp @@ -31,9 +31,9 @@ enum { POS_STATUS = 1 }; -DENG_GUI_PIMPL(MultiplayerStatusWidget) -, DENG2_OBSERVES(ServerLink, Join) -, DENG2_OBSERVES(ServerLink, Leave) +DE_GUI_PIMPL(MultiplayerStatusWidget) +, DE_OBSERVES(ServerLink, Join) +, DE_OBSERVES(ServerLink, Leave) { QTimer timer; diff --git a/doomsday/apps/client/src/ui/widgets/packagecontentoptionswidget.cpp b/doomsday/apps/client/src/ui/widgets/packagecontentoptionswidget.cpp index f0eac6a741..b0f05895e5 100644 --- a/doomsday/apps/client/src/ui/widgets/packagecontentoptionswidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/packagecontentoptionswidget.cpp @@ -31,7 +31,7 @@ using namespace de; -DENG_GUI_PIMPL(PackageContentOptionsWidget) +DE_GUI_PIMPL(PackageContentOptionsWidget) , public ChildWidgetOrganizer::IWidgetFactory { /** @@ -230,7 +230,7 @@ DENG_GUI_PIMPL(PackageContentOptionsWidget) summary->setText(tr("%1 package%2 (%3 optional)") .arg(totalCount) - .arg(DENG2_PLURAL_S(totalCount)) + .arg(DE_PLURAL_S(totalCount)) .arg(optionalCount)); makeItems(recommends, true); diff --git a/doomsday/apps/client/src/ui/widgets/packagesbuttonwidget.cpp b/doomsday/apps/client/src/ui/widgets/packagesbuttonwidget.cpp index b7720f58af..498c532b76 100644 --- a/doomsday/apps/client/src/ui/widgets/packagesbuttonwidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/packagesbuttonwidget.cpp @@ -23,7 +23,7 @@ using namespace de; -DENG_GUI_PIMPL(PackagesButtonWidget) +DE_GUI_PIMPL(PackagesButtonWidget) { StringList packages; String dialogTitle; diff --git a/doomsday/apps/client/src/ui/widgets/packagessidebarwidget.cpp b/doomsday/apps/client/src/ui/widgets/packagessidebarwidget.cpp index 24eee1e0e0..4250b94158 100644 --- a/doomsday/apps/client/src/ui/widgets/packagessidebarwidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/packagessidebarwidget.cpp @@ -27,7 +27,7 @@ using namespace de; -DENG_GUI_PIMPL(PackagesSidebarWidget) +DE_GUI_PIMPL(PackagesSidebarWidget) { PackagesWidget *browser; diff --git a/doomsday/apps/client/src/ui/widgets/packageswidget.cpp b/doomsday/apps/client/src/ui/widgets/packageswidget.cpp index 67310d9bea..965e74e809 100644 --- a/doomsday/apps/client/src/ui/widgets/packageswidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/packageswidget.cpp @@ -70,9 +70,8 @@ static PackageLoadStatus isPackageLoaded; PackagesWidget::IPackageStatus::~IPackageStatus() {} -DENG_GUI_PIMPL(PackagesWidget) -//, DENG2_OBSERVES(res::Bundles, Identify) -, DENG2_OBSERVES(FileSystem, Busy) +DE_GUI_PIMPL(PackagesWidget) +, DE_OBSERVES(FileSystem, Busy) , public ChildWidgetOrganizer::IWidgetFactory { /** @@ -80,7 +79,7 @@ DENG_GUI_PIMPL(PackagesWidget) */ struct PackageItem : public ui::Item - , DENG2_OBSERVES(File, Deletion) { + , DE_OBSERVES(File, Deletion) { SafePtr file; const Record * info = nullptr; NativePath nativePath; @@ -135,9 +134,9 @@ DENG_GUI_PIMPL(PackagesWidget) */ class PackageListItemWidget : public HomeItemWidget - , DENG2_OBSERVES(ChildWidgetOrganizer, WidgetCreation) // actions - , DENG2_OBSERVES(ChildWidgetOrganizer, WidgetUpdate) // actions - , DENG2_OBSERVES(Bank, Load) // package icons + , DE_OBSERVES(ChildWidgetOrganizer, WidgetCreation) // actions + , DE_OBSERVES(ChildWidgetOrganizer, WidgetUpdate) // actions + , DE_OBSERVES(Bank, Load) // package icons { public: PackageListItemWidget(PackageItem const &item, PackagesWidget &owner) @@ -419,7 +418,7 @@ DENG_GUI_PIMPL(PackagesWidget) { if (_iconId) return; - DENG2_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_IN_MAIN_THREAD(); auto &bank = iconBank(); @@ -504,7 +503,7 @@ DENG_GUI_PIMPL(PackagesWidget) { defaultActionItems << new ui::VariantActionItem( tr("Load"), tr("Unload"), new CallbackAction([this]() { - DENG2_ASSERT(menu->interactedItem()); + DE_ASSERT(menu->interactedItem()); String const packageId = menu->interactedItem()->as().data().toString(); diff --git a/doomsday/apps/client/src/ui/widgets/panelbuttonwidget.cpp b/doomsday/apps/client/src/ui/widgets/panelbuttonwidget.cpp index 28d5ec0a3f..169d0b66a2 100644 --- a/doomsday/apps/client/src/ui/widgets/panelbuttonwidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/panelbuttonwidget.cpp @@ -20,7 +20,7 @@ using namespace de; -DENG_GUI_PIMPL(PanelButtonWidget) +DE_GUI_PIMPL(PanelButtonWidget) { PanelWidget *drawer; diff --git a/doomsday/apps/client/src/ui/widgets/privilegedlogwidget.cpp b/doomsday/apps/client/src/ui/widgets/privilegedlogwidget.cpp index ebcb26eead..8a932935ac 100644 --- a/doomsday/apps/client/src/ui/widgets/privilegedlogwidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/privilegedlogwidget.cpp @@ -23,7 +23,7 @@ using namespace de; -DENG_GUI_PIMPL(PrivilegedLogWidget) +DE_GUI_PIMPL(PrivilegedLogWidget) { StyledLogSinkFormatter formatter; LogWidget *log = nullptr; diff --git a/doomsday/apps/client/src/ui/widgets/profilepickerwidget.cpp b/doomsday/apps/client/src/ui/widgets/profilepickerwidget.cpp index d01b65030e..add29eae30 100644 --- a/doomsday/apps/client/src/ui/widgets/profilepickerwidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/profilepickerwidget.cpp @@ -29,7 +29,7 @@ using namespace de::ui; static int const MAX_VISIBLE_PROFILE_NAME = 50; static int const MAX_PROFILE_NAME = 100; -DENG_GUI_PIMPL(ProfilePickerWidget) +DE_GUI_PIMPL(ProfilePickerWidget) { ConfigProfiles &settings; String description; diff --git a/doomsday/apps/client/src/ui/widgets/sidebarwidget.cpp b/doomsday/apps/client/src/ui/widgets/sidebarwidget.cpp index 7dc17c8c84..c3ef95a07e 100644 --- a/doomsday/apps/client/src/ui/widgets/sidebarwidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/sidebarwidget.cpp @@ -30,8 +30,8 @@ using namespace de; using namespace de::ui; -DENG_GUI_PIMPL(SidebarWidget) -, DENG2_OBSERVES(DoomsdayApp, GameChange) +DE_GUI_PIMPL(SidebarWidget) +, DE_OBSERVES(DoomsdayApp, GameChange) { DialogContentStylist stylist; GuiWidget *container; diff --git a/doomsday/apps/client/src/ui/widgets/taskbarwidget.cpp b/doomsday/apps/client/src/ui/widgets/taskbarwidget.cpp index 6d273b2dd2..64528df289 100644 --- a/doomsday/apps/client/src/ui/widgets/taskbarwidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/taskbarwidget.cpp @@ -89,11 +89,11 @@ enum MenuItemPositions POS_UI_SETTINGS = 9, }; -DENG_GUI_PIMPL(TaskBarWidget) -, DENG2_OBSERVES(DoomsdayApp, GameChange) -, DENG2_OBSERVES(ServerLink, Join) -, DENG2_OBSERVES(ServerLink, Leave) -, DENG2_OBSERVES(PanelWidget, AboutToOpen) // update menu +DE_GUI_PIMPL(TaskBarWidget) +, DE_OBSERVES(DoomsdayApp, GameChange) +, DE_OBSERVES(ServerLink, Join) +, DE_OBSERVES(ServerLink, Leave) +, DE_OBSERVES(PanelWidget, AboutToOpen) // update menu { typedef DefaultVertexBuf VertexBuf; @@ -348,7 +348,7 @@ DENG_GUI_PIMPL(TaskBarWidget) } }; -#if defined (DENG_HAVE_UPDATER) +#if defined (DE_HAVE_UPDATER) static PopupWidget *makeUpdaterSettings() { return new UpdaterSettingsDialog(UpdaterSettingsDialog::WithApplyAndCheckButton); @@ -468,7 +468,7 @@ TaskBarWidget::TaskBarWidget() : GuiWidget("taskbar"), d(new Impl(this)) << new ui::Item(ui::Item::Separator) << new ui::SubwidgetItem(style().images().image("package.icon"), tr("Data Files"), ui::Left, makePopup) << new ui::SubwidgetItem(style().images().image("home.icon"), tr("User Interface"), ui::Left, makePopup); -#if defined (DENG_HAVE_UPDATER) +#if defined (DE_HAVE_UPDATER) d->configMenu->items() << new ui::SubwidgetItem(style().images().image("updater"), tr("Updater"), ui::Left, makeUpdaterSettings); #endif @@ -495,12 +495,12 @@ TaskBarWidget::TaskBarWidget() : GuiWidget("taskbar"), d(new Impl(this)) tr("Forces a refresh of resource file metadata.")) << new ui::Item(ui::Item::Separator) << new ui::Item(ui::Item::Separator, tr("Doomsday")) -#if defined (DENG_HAVE_UPDATER) +#if defined (DE_HAVE_UPDATER) << new ui::ActionItem(tr("Check for Updates"), new CommandAction("updateandnotify")) #endif << new ui::ActionItem(tr("About Doomsday"), new SignalAction(this, SLOT(showAbout()))) << helpMenu -#if !defined (DENG_MOBILE) +#if !defined (DE_MOBILE) << new ui::Item(ui::Item::Separator) << new ui::ActionItem(tr("Quit Doomsday"), new CommandAction("quit!")) #endif @@ -787,7 +787,7 @@ void TaskBarWidget::showAbout() root().window().glDone(); } -#if defined (DENG_HAVE_UPDATER) +#if defined (DE_HAVE_UPDATER) void TaskBarWidget::showUpdaterSettings() { /// @todo This has actually little to do with the taskbar. -jk @@ -800,7 +800,7 @@ void TaskBarWidget::showUpdaterSettings() void TaskBarWidget::showOrHideHome() { - DENG2_ASSERT(App_GameLoaded()); + DE_ASSERT(App_GameLoaded()); // Minimize the game, switch to MP column in Home. auto &win = ClientWindow::main(); diff --git a/doomsday/apps/client/src/ui/widgets/tutorialwidget.cpp b/doomsday/apps/client/src/ui/widgets/tutorialwidget.cpp index 46c00dfc62..a7263fa9a1 100644 --- a/doomsday/apps/client/src/ui/widgets/tutorialwidget.cpp +++ b/doomsday/apps/client/src/ui/widgets/tutorialwidget.cpp @@ -39,7 +39,7 @@ using namespace de; static TimeSpan const FLASH_SPAN = 0.6; -DENG_GUI_PIMPL(TutorialWidget) +DE_GUI_PIMPL(TutorialWidget) { enum Step { Welcome, diff --git a/doomsday/apps/client/src/ui/zonedebug.cpp b/doomsday/apps/client/src/ui/zonedebug.cpp index 837832e873..0a16c7e932 100644 --- a/doomsday/apps/client/src/ui/zonedebug.cpp +++ b/doomsday/apps/client/src/ui/zonedebug.cpp @@ -24,7 +24,7 @@ #include "de_base.h" -#if defined (DENG_DEBUG) && defined (DENG_OPENGL) +#if defined (DE_DEBUG) && defined (DE_OPENGL) #include #include @@ -46,7 +46,7 @@ using namespace de; static void drawRegion(memvolume_t &volume, Rectanglei const &rect, size_t start, size_t size, float const color[4]) { - DENG2_ASSERT(start + size <= volume.size); + DE_ASSERT(start + size <= volume.size); int const bytesPerRow = (volume.size - sizeof(memzone_t)) / rect.height(); float const toPixelScale = (float)rect.width() / (float)bytesPerRow; @@ -141,8 +141,8 @@ void Z_DebugDrawer(void) if (!CommandLine_Exists("-zonedebug")) return; - DENG_ASSERT_IN_MAIN_THREAD(); - DENG_ASSERT_GL_CONTEXT_ACTIVE(); + DE_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_GL_CONTEXT_ACTIVE(); //glDisable(GL_CULL_FACE); //glDisable(GL_DEPTH_TEST); @@ -154,7 +154,7 @@ void Z_DebugDrawer(void) DGL_MatrixMode(DGL_PROJECTION); DGL_PushMatrix(); DGL_LoadIdentity(); - DGL_Ortho(0, 0, DENG_GAMEVIEW_WIDTH, DENG_GAMEVIEW_HEIGHT, -1, 1); + DGL_Ortho(0, 0, DE_GAMEVIEW_WIDTH, DE_GAMEVIEW_HEIGHT, -1, 1); DGL_MatrixMode(DGL_MODELVIEW); DGL_PushMatrix(); @@ -168,18 +168,18 @@ void Z_DebugDrawer(void) // Make sure all the volumes fit vertically. volCount = pd.volumeCount; h = 200; - if (h * volCount + 10*(volCount - 1) > DENG_GAMEVIEW_HEIGHT) + if (h * volCount + 10*(volCount - 1) > DE_GAMEVIEW_HEIGHT) { - h = (DENG_GAMEVIEW_HEIGHT - 10*(volCount - 1))/volCount; + h = (DE_GAMEVIEW_HEIGHT - 10*(volCount - 1))/volCount; } i = 0; for (volume = pd.volumeRoot; volume; volume = volume->next, ++i) { - int size = de::min(400, DENG_GAMEVIEW_WIDTH); + int size = de::min(400, DE_GAMEVIEW_WIDTH); Z_DebugDrawVolume(&pd, volume, - Rectanglei::fromSize(Vec2i(DENG_GAMEVIEW_WIDTH - size - 1, - DENG_GAMEVIEW_HEIGHT - size * (i+1) - 10*i - 1), + Rectanglei::fromSize(Vec2i(DE_GAMEVIEW_WIDTH - size - 1, + DE_GAMEVIEW_HEIGHT - size * (i+1) - 10*i - 1), Vec2ui(size, size))); } diff --git a/doomsday/apps/client/src/unix/joystick.cpp b/doomsday/apps/client/src/unix/joystick.cpp index f5e7c3fe12..7314b82fcc 100644 --- a/doomsday/apps/client/src/unix/joystick.cpp +++ b/doomsday/apps/client/src/unix/joystick.cpp @@ -21,7 +21,7 @@ */ #include -#ifndef DENG_NO_SDL +#ifndef DE_NO_SDL # include #endif @@ -39,19 +39,19 @@ static dd_bool joyInited; static byte joyAvailable; // Input enabled from a source? static dd_bool joyButtonWasDown[IJOY_MAXBUTTONS]; -#ifndef DENG_NO_SDL +#ifndef DE_NO_SDL static SDL_Joystick *joy; #endif void Joystick_Register(void) { -#ifndef DENG_NO_SDL +#ifndef DE_NO_SDL C_VAR_INT("input-joy-device", &joydevice, CVF_NO_MAX | CVF_PROTECTED, 0, 0); C_VAR_BYTE("input-joy", &useJoystickCvar, 0, 0, 1); #endif } -#ifndef DENG_NO_SDL +#ifndef DE_NO_SDL static void initialize(void) { int joycount; @@ -109,7 +109,7 @@ static void initialize(void) bool Joystick_Init(void) { -#ifndef DENG_NO_SDL +#ifndef DE_NO_SDL if (joyInited) return true; // Already initialized. LOG_AS("Joystick_Init"); @@ -122,7 +122,7 @@ bool Joystick_Init(void) void Joystick_Shutdown(void) { -#ifndef DENG_NO_SDL +#ifndef DE_NO_SDL if (!joyInited) return; // Not initialized. if (joy) @@ -142,7 +142,7 @@ bool Joystick_IsPresent(void) void Joystick_GetState(joystate_t *state) { -#ifndef DENG_NO_SDL +#ifndef DE_NO_SDL int i, pov; memset(state, 0, sizeof(*state)); @@ -232,7 +232,7 @@ void Joystick_GetState(joystate_t *state) de::String Joystick_Name() { -#ifndef DENG_NO_SDL +#ifndef DE_NO_SDL return SDL_JoystickName(joy); #else return ""; diff --git a/doomsday/apps/client/src/updater/updateavailabledialog.cpp b/doomsday/apps/client/src/updater/updateavailabledialog.cpp index c4de564076..d55cfe7e21 100644 --- a/doomsday/apps/client/src/updater/updateavailabledialog.cpp +++ b/doomsday/apps/client/src/updater/updateavailabledialog.cpp @@ -36,8 +36,8 @@ using namespace de; static TimeSpan const SHOW_ANIM_SPAN = 0.3; -DENG_GUI_PIMPL(UpdateAvailableDialog), -DENG2_OBSERVES(ToggleWidget, Toggle) +DE_GUI_PIMPL(UpdateAvailableDialog), +DE_OBSERVES(ToggleWidget, Toggle) { ProgressWidget *checking; ToggleWidget *autoCheck; diff --git a/doomsday/apps/client/src/updater/updatedownloaddialog.cpp b/doomsday/apps/client/src/updater/updatedownloaddialog.cpp index 43e2f52c01..9a33f8a1f2 100644 --- a/doomsday/apps/client/src/updater/updatedownloaddialog.cpp +++ b/doomsday/apps/client/src/updater/updatedownloaddialog.cpp @@ -44,7 +44,7 @@ using namespace de; static UpdateDownloadDialog *downloadInProgress; -DENG_GUI_PIMPL(UpdateDownloadDialog) +DE_GUI_PIMPL(UpdateDownloadDialog) { enum State { Connecting, @@ -329,7 +329,7 @@ bool UpdateDownloadDialog::isDownloadInProgress() UpdateDownloadDialog &UpdateDownloadDialog::currentDownload() { - DENG2_ASSERT(isDownloadInProgress()); + DE_ASSERT(isDownloadInProgress()); return *downloadInProgress; } diff --git a/doomsday/apps/client/src/updater/updater.cpp b/doomsday/apps/client/src/updater/updater.cpp index a0e47f1b89..065ff5fed0 100644 --- a/doomsday/apps/client/src/updater/updater.cpp +++ b/doomsday/apps/client/src/updater/updater.cpp @@ -74,7 +74,7 @@ using namespace de; # define INSTALL_SCRIPT_NAME "deng-upgrade.scpt" #endif -#define PLATFORM_ID DENG_PLATFORM_ID +#define PLATFORM_ID DE_PLATFORM_ID static CommandLine* installerCommand; @@ -83,7 +83,7 @@ static CommandLine* installerCommand; */ static void runInstallerCommand(void) { - DENG_ASSERT(installerCommand != 0); + DE_ASSERT(installerCommand != 0); installerCommand->execute(); delete installerCommand; @@ -140,8 +140,8 @@ class UpdaterStatusWidget : public ProgressWidget PopupButtonWidget *_clickable; }; -DENG2_PIMPL(Updater) -, DENG2_OBSERVES(App, StartupComplete) +DE_PIMPL(Updater) +, DE_OBSERVES(App, StartupComplete) { QNetworkAccessManager *network = nullptr; UpdateDownloadDialog *download = nullptr; // not owned (in the widget tree, if exists) @@ -187,7 +187,7 @@ DENG2_PIMPL(Updater) UpdaterSettings st; String uri = String("%1builds?latest_for=%2&type=%3") .arg(App::apiUrl()) - .arg(DENG_PLATFORM_ID) + .arg(DE_PLATFORM_ID) .arg(st.channel() == UpdaterSettings::Stable? "stable" : st.channel() == UpdaterSettings::Unstable? "unstable" : "candidate"); LOG_XVERBOSE("URI: ", uri); @@ -292,7 +292,7 @@ DENG2_PIMPL(Updater) { reply->deleteLater(); // make sure it gets deleted - DENG2_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_IN_MAIN_THREAD(); showNotification(false); if (reply->error() != QNetworkReply::NoError) @@ -382,7 +382,7 @@ DENG2_PIMPL(Updater) void execAvailableDialog() { - DENG2_ASSERT(availableDlg != 0); + DE_ASSERT(availableDlg != 0); availableDlg->setDeleteAfterDismissed(true); QObject::connect(availableDlg, SIGNAL(checkAgain()), thisPublic, SLOT(recheck())); @@ -397,7 +397,7 @@ DENG2_PIMPL(Updater) void startDownload() { - DENG2_ASSERT(!download); + DE_ASSERT(!download); // The notification provides access to the download dialog. showDownloadNotification(); @@ -425,7 +425,7 @@ DENG2_PIMPL(Updater) #ifdef MACOSX de::String volName = "Doomsday Engine " + latestVersion.compactNumber(); -#ifdef DENG2_QT_5_0_OR_NEWER +#ifdef DE_QT_5_0_OR_NEWER QString scriptPath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation); #else QString scriptPath = QDesktopServices::storageLocation(QDesktopServices::CacheLocation); diff --git a/doomsday/apps/client/src/updater/updatersettings.cpp b/doomsday/apps/client/src/updater/updatersettings.cpp index 1d13c6254b..795058c0d3 100644 --- a/doomsday/apps/client/src/updater/updatersettings.cpp +++ b/doomsday/apps/client/src/updater/updatersettings.cpp @@ -153,7 +153,7 @@ void UpdaterSettings::setPathToDeleteAtStartup(de::NativePath deletePath) de::NativePath UpdaterSettings::defaultDownloadPath() { -#ifdef DENG2_QT_5_0_OR_NEWER +#ifdef DE_QT_5_0_OR_NEWER return QStandardPaths::writableLocation(QStandardPaths::CacheLocation); #else return QDesktopServices::storageLocation(QDesktopServices::CacheLocation); diff --git a/doomsday/apps/client/src/updater/updatersettingsdialog.cpp b/doomsday/apps/client/src/updater/updatersettingsdialog.cpp index 8880d9fdad..8387138db8 100644 --- a/doomsday/apps/client/src/updater/updatersettingsdialog.cpp +++ b/doomsday/apps/client/src/updater/updatersettingsdialog.cpp @@ -36,7 +36,7 @@ using namespace de; #if 0 static QString defaultLocationName() { -#ifdef DENG2_QT_5_0_OR_NEWER +#ifdef DE_QT_5_0_OR_NEWER QString name = QStandardPaths::displayName(QStandardPaths::CacheLocation); #else QString name = QDesktopServices::displayName(QDesktopServices::CacheLocation); @@ -49,8 +49,8 @@ static QString defaultLocationName() } #endif -DENG2_PIMPL(UpdaterSettingsDialog), -DENG2_OBSERVES(ToggleWidget, Toggle) +DE_PIMPL(UpdaterSettingsDialog), +DE_OBSERVES(ToggleWidget, Toggle) { ToggleWidget *autoCheck; ChoiceWidget *freqs; diff --git a/doomsday/apps/client/src/windows/mouse_win32.cpp b/doomsday/apps/client/src/windows/mouse_win32.cpp index 6f3b9c30f2..06f6a68d6d 100644 --- a/doomsday/apps/client/src/windows/mouse_win32.cpp +++ b/doomsday/apps/client/src/windows/mouse_win32.cpp @@ -210,7 +210,7 @@ static void Mouse_Win32_GetState(mousestate_t* state) static void Mouse_Win32_Trap(dd_bool enabled) { LOG_AS("Mouse_Win32"); - DENG_ASSERT(didMouse); + DE_ASSERT(didMouse); mouseTrapped = (enabled != 0); if(enabled) diff --git a/doomsday/apps/client/src/world/base/bindings_world.cpp b/doomsday/apps/client/src/world/base/bindings_world.cpp index 1dd0a2e327..6497115ced 100644 --- a/doomsday/apps/client/src/world/base/bindings_world.cpp +++ b/doomsday/apps/client/src/world/base/bindings_world.cpp @@ -62,8 +62,8 @@ void initBindings(Binder &binder, Record &worldModule) startSoundArgs["volume"] = new NumberValue(1.0); binder.init(thing) - << DENG2_FUNC_NOARG(Thing_Health, "health") - << DENG2_FUNC_DEFS (Thing_StartSound, "startSound", "id" << "volume", startSoundArgs); + << DE_FUNC_NOARG(Thing_Health, "health"); + << DE_FUNC_DEFS (Thing_StartSound, "startSound", "id" << "volume", startSoundArgs); } } diff --git a/doomsday/apps/client/src/world/base/blockmap.cpp b/doomsday/apps/client/src/world/base/blockmap.cpp index 3241dc901a..e033ea39be 100644 --- a/doomsday/apps/client/src/world/base/blockmap.cpp +++ b/doomsday/apps/client/src/world/base/blockmap.cpp @@ -131,13 +131,13 @@ struct CellData void addElement(RingNode &node, void *elem) { - DENG2_ASSERT(node.elem == nullptr); + DE_ASSERT(node.elem == nullptr); node.elem = elem; elemCount++; } }; -DENG2_PIMPL(Blockmap) +DE_PIMPL(Blockmap) { /** * Quadtree node. diff --git a/doomsday/apps/client/src/world/base/clientserverworld.cpp b/doomsday/apps/client/src/world/base/clientserverworld.cpp index be671f7c69..95661c33a0 100644 --- a/doomsday/apps/client/src/world/base/clientserverworld.cpp +++ b/doomsday/apps/client/src/world/base/clientserverworld.cpp @@ -111,9 +111,9 @@ static inline RenderSystem &rendSys() * @todo Consolidate with the missing material reporting done elsewhere -ds */ class MapConversionReporter -: DENG2_OBSERVES(Map, UnclosedSectorFound) -, DENG2_OBSERVES(Map, OneWayWindowFound) -, DENG2_OBSERVES(BaseMap, Deletion) +: DE_OBSERVES(Map, UnclosedSectorFound) +, DE_OBSERVES(Map, OneWayWindowFound) +, DE_OBSERVES(BaseMap, Deletion) { /// Record "unclosed sectors". /// Sector index => world point relatively near to the problem area. @@ -233,8 +233,8 @@ class MapConversionReporter /// Observes Map Deletion. void mapBeingDeleted(BaseMap const &map) { - DENG2_ASSERT(&map == _map); // sanity check. - DENG2_UNUSED(map); + DE_ASSERT(&map == _map); // sanity check. + DE_UNUSED(map); _map = nullptr; } @@ -244,7 +244,7 @@ class MapConversionReporter static inline dint maxWarnings(dint issueCount) { -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG return issueCount; // No limit. #else return de::min(issueCount, maxWarningsPerType); @@ -286,7 +286,7 @@ static char const *mapCacheDir = "mapcache/"; /// Determine the identity key for maps loaded from the specified @a sourcePath. static String cacheIdForMap(String const &sourcePath) { - DENG2_ASSERT(!sourcePath.isEmpty()); + DE_ASSERT(!sourcePath.isEmpty()); dushort id = 0; for (dint i = 0; i < sourcePath.size(); ++i) @@ -297,7 +297,7 @@ static String cacheIdForMap(String const &sourcePath) return String("%1").arg(id, 4, 16); } -DENG2_PIMPL(ClientServerWorld) +DE_PIMPL(ClientServerWorld) { Binder binder; ///< Doomsday Script bindings for the World. Record worldModule; @@ -476,7 +476,7 @@ DENG2_PIMPL(ClientServerWorld) if (!map) return; // We cannot make an editable map current. - DENG2_ASSERT(!map->isEditable()); + DE_ASSERT(!map->isEditable()); // Should we cache this map? /*if (mapCache && !haveCachedMap(&map->def())) @@ -774,21 +774,21 @@ DENG2_PIMPL(ClientServerWorld) #if 0 void updateHandOrigin() { - DENG2_ASSERT(hand != nullptr && self().hasMap()); + DE_ASSERT(hand != nullptr && self().hasMap()); viewdata_t const *viewData = &::viewPlayer->viewport(); hand->setOrigin(viewData->current.origin + viewData->frontVec.xzy() * handDistance); } #endif // 0 - DENG2_PIMPL_AUDIENCE(FrameBegin) - DENG2_PIMPL_AUDIENCE(FrameEnd) + DE_PIMPL_AUDIENCE(FrameBegin) + DE_PIMPL_AUDIENCE(FrameEnd) #endif }; #ifdef __CLIENT__ -DENG2_AUDIENCE_METHOD(ClientServerWorld, FrameBegin) -DENG2_AUDIENCE_METHOD(ClientServerWorld, FrameEnd) +DE_AUDIENCE_METHOD(ClientServerWorld, FrameBegin) +DE_AUDIENCE_METHOD(ClientServerWorld, FrameEnd) #endif ClientServerWorld::ClientServerWorld() @@ -921,7 +921,7 @@ void ClientServerWorld::tick(timespan_t elapsed) } } #else - DENG2_UNUSED(elapsed); + DE_UNUSED(elapsed); #endif } @@ -950,7 +950,7 @@ Hand &ClientServerWorld::hand(ddouble *distance) const void ClientServerWorld::beginFrame(bool resetNextViewer) { // Notify interested parties that a new frame has begun. - DENG2_FOR_AUDIENCE2(FrameBegin, i) i->worldSystemFrameBegins(resetNextViewer); + DE_FOR_AUDIENCE2(FrameBegin, i) i->worldSystemFrameBegins(resetNextViewer); } void ClientServerWorld::endFrame() @@ -970,7 +970,7 @@ void ClientServerWorld::endFrame() #endif // Notify interested parties that the current frame has ended. - DENG2_FOR_AUDIENCE2(FrameEnd, i) i->worldSystemFrameEnds(); + DE_FOR_AUDIENCE2(FrameEnd, i) i->worldSystemFrameEnds(); } #endif // __CLIENT__ diff --git a/doomsday/apps/client/src/world/base/convexsubspace.cpp b/doomsday/apps/client/src/world/base/convexsubspace.cpp index 68dfcc627c..38e07cf19e 100644 --- a/doomsday/apps/client/src/world/base/convexsubspace.cpp +++ b/doomsday/apps/client/src/world/base/convexsubspace.cpp @@ -50,7 +50,7 @@ ddouble triangleArea(Vec2d const &v1, Vec2d const &v2, Vec2d const &v3) namespace world { -DENG2_PIMPL(ConvexSubspace) +DE_PIMPL(ConvexSubspace) { Face *poly = nullptr; ///< Convex polygon geometry (not owned). @@ -193,7 +193,7 @@ void ConvexSubspace::setBspLeaf(BspLeaf *newBspLeaf) Face &ConvexSubspace::poly() const { - DENG2_ASSERT(d->poly); + DE_ASSERT(d->poly); return *d->poly; } diff --git a/doomsday/apps/client/src/world/base/impulseaccumulator.cpp b/doomsday/apps/client/src/world/base/impulseaccumulator.cpp index bf324d8e47..d61ad1da32 100644 --- a/doomsday/apps/client/src/world/base/impulseaccumulator.cpp +++ b/doomsday/apps/client/src/world/base/impulseaccumulator.cpp @@ -47,7 +47,7 @@ static inline InputSystem &inputSys() static int pimpDoubleClickThreshold = 300; ///< Milliseconds, cvar #endif -DENG2_PIMPL_NOREF(ImpulseAccumulator) +DE_PIMPL_NOREF(ImpulseAccumulator) { int impulseId = 0; int playerNum = 0; @@ -59,7 +59,7 @@ DENG2_PIMPL_NOREF(ImpulseAccumulator) inline PlayerImpulse &getImpulse() const { auto *impulse = P_PlayerImpulsePtr(impulseId); - DENG2_ASSERT(impulse); + DE_ASSERT(impulse); return *impulse; } @@ -145,7 +145,7 @@ DENG2_PIMPL_NOREF(ImpulseAccumulator) symbolicName += impulse.name; int const localPlayer = P_ConsoleToLocal(playerNum); - DENG2_ASSERT(localPlayer >= 0); + DE_ASSERT(localPlayer >= 0); LOG_INPUT_XVERBOSE("Triggered " _E(b) "'%s'" _E(.) " for player%i state: %i threshold: %i\n %s", impulse.name << (localPlayer + 1) << newState << (nowTime - db.previousClickTime) << symbolicName); @@ -203,7 +203,7 @@ bool ImpulseAccumulator::expireBeforeSharpTick() const void ImpulseAccumulator::receiveBinary() { // Ensure this is really a binary accumulator. - DENG2_ASSERT(d->type == Binary); + DE_ASSERT(d->type == Binary); LOG_AS("ImpulseAccumulator"); d->binaryAccum++; @@ -218,7 +218,7 @@ void ImpulseAccumulator::receiveBinary() int ImpulseAccumulator::takeBinary() { // Ensure this is really a binary accumulator. - DENG2_ASSERT(d->type == Binary); + DE_ASSERT(d->type == Binary); LOG_AS("ImpulseAccumulator"); short *counter = &d->binaryAccum; int count = *counter; @@ -231,7 +231,7 @@ int ImpulseAccumulator::takeBinary() void ImpulseAccumulator::takeAnalog(float *pos, float *relOffset) { // Ensure this is really an analog accumulator. - DENG2_ASSERT(d->type == Analog); + DE_ASSERT(d->type == Analog); LOG_AS("ImpulseAccumulator"); if(pos) *pos = 0; @@ -269,7 +269,7 @@ void ImpulseAccumulator::clearAll() takeBinary(); break; - default: DENG2_ASSERT_FAIL("ImpulseAccumulator::clearAll: Unknown type"); + default: DE_ASSERT_FAIL("ImpulseAccumulator::clearAll: Unknown type"); } // Also clear the double click state. diff --git a/doomsday/apps/client/src/world/base/interceptor.cpp b/doomsday/apps/client/src/world/base/interceptor.cpp index 453e5f359c..c4b62cbbd9 100644 --- a/doomsday/apps/client/src/world/base/interceptor.cpp +++ b/doomsday/apps/client/src/world/base/interceptor.cpp @@ -41,7 +41,7 @@ struct ListNode template ObjectType &objectAs() const { - DENG2_ASSERT(object); + DE_ASSERT(object); return *static_cast(object); } }; @@ -56,7 +56,7 @@ static ListNode head; static ListNode tail; static ListNode *mru; -DENG2_PIMPL_NOREF(Interceptor) +DE_PIMPL_NOREF(Interceptor) { traverser_t callback; void *context; @@ -140,7 +140,7 @@ DENG2_PIMPL_NOREF(Interceptor) */ void addIntercept(intercepttype_t type, dfloat distance, void *object) { - DENG2_ASSERT(object); + DE_ASSERT(object); // First reject vs our sentinels if(distance < head.distance) return; @@ -348,7 +348,7 @@ LineOpening const &Interceptor::opening() const bool Interceptor::adjustOpening(Line const *line) { - DENG2_ASSERT(d->map != 0); + DE_ASSERT(d->map != 0); if(line) { if(d->map == &line->map()) diff --git a/doomsday/apps/client/src/world/base/line.cpp b/doomsday/apps/client/src/world/base/line.cpp index 6aa5d1083c..f9165f279d 100644 --- a/doomsday/apps/client/src/world/base/line.cpp +++ b/doomsday/apps/client/src/world/base/line.cpp @@ -53,7 +53,7 @@ using namespace de; using namespace world; -DENG2_PIMPL_NOREF(Line::Side::Segment) +DE_PIMPL_NOREF(Line::Side::Segment) { HEdge *hedge = nullptr; ///< Half-edge attributed to the line segment (not owned). @@ -83,7 +83,7 @@ Line::Side const &Line::Side::Segment::lineSide() const HEdge &Line::Side::Segment::hedge() const { - DENG2_ASSERT(d->hedge); + DE_ASSERT(d->hedge); return *d->hedge; } @@ -121,7 +121,7 @@ void Line::Side::Segment::setFrontFacing(bool yes) #endif // __CLIENT__ -DENG2_PIMPL(Line::Side) +DE_PIMPL(Line::Side) { /** * Line side section of which there are three (middle, bottom and top). @@ -211,7 +211,7 @@ DENG2_PIMPL(Line::Side) /// @throw Line::InvalidSectionIdError The given section identifier is not valid. throw Line::InvalidSectionIdError("Line::Side::section", "Invalid section id " + String::number(sectionId));*/ - DENG2_ASSERT(sectionId >= Middle && sectionId <= Top); + DE_ASSERT(sectionId >= Middle && sectionId <= Top); return *sections->sections[sectionId]; } @@ -235,7 +235,7 @@ DENG2_PIMPL(Line::Side) #ifdef __CLIENT__ void updateRadioCorner(shadowcorner_t &sc, dfloat openness, Plane *proximityPlane = nullptr, bool top = false) { - DENG2_ASSERT(self()._sector); + DE_ASSERT(self()._sector); sc.corner = openness; sc.proximity = proximityPlane; if (sc.proximity) @@ -326,7 +326,7 @@ String Line::Side::description() const "%4") .arg(Line::sideIdAsText(sideId()).upperFirstChar()) .arg(hasSector() ? String::number(sector().indexInMap()) : "None") - .arg(DENG2_BOOL_YESNO(considerOneSided())) + .arg(DE_BOOL_YESNO(considerOneSided())) .arg(flagsString); forAllSurfaces([this, &text] (Surface &suf) @@ -556,7 +556,7 @@ void Line::Side::updateSoundEmitterOrigin(dint sectionId) emitter.origin[0] = lineCenter.x; emitter.origin[1] = lineCenter.y; - DENG2_ASSERT(_sector); + DE_ASSERT(_sector); ddouble const ffloor = _sector->floor().height(); ddouble const fceil = _sector->ceiling().height(); @@ -928,7 +928,7 @@ static void scanNeighbor(LineSide const &side, bool top, bool right, edge_t &edg { // Since we have the details of the backsector already, simply get the next // neighbor (it *is* the back neighbor). - DENG2_ASSERT(edge.line); + DE_ASSERT(edge.line); edge.line = R_FindLineNeighbor(*edge.line, *edge.line->vertexOwner(dint(edge.line->back().hasSector() && edge.line->back().sectorPtr() == edge.sector) ^ dint(right)), direction, edge.sector, &edge.diff); @@ -1056,8 +1056,8 @@ String Line::Side::sectionIdAsText(dint sectionId) // static }; } -DENG2_PIMPL(Line) -, DENG2_OBSERVES(Vertex, OriginChange) +DE_PIMPL(Line) +, DE_OBSERVES(Vertex, OriginChange) { dint flags; ///< Public DDLF_* flags. Side front; ///< Front side of the line. @@ -1122,9 +1122,9 @@ DENG2_PIMPL(Line) void vertexOriginChanged(Vertex &vtx) { - DENG2_ASSERT(&vtx == from || &vtx == to); // Should only observe changes to "our" vertices. - DENG2_ASSERT(polyobj != nullptr); // Should only observe changes to moveable (not editable) vertices. - DENG2_UNUSED(vtx); + DE_ASSERT(&vtx == from || &vtx == to); // Should only observe changes to "our" vertices. + DE_ASSERT(polyobj != nullptr); // Should only observe changes to moveable (not editable) vertices. + DE_UNUSED(vtx); // Clear the now invalid geometry metrics (will update later). gdata.release(); @@ -1157,7 +1157,7 @@ void Line::setFlags(dint flagsToChange, FlagOp operation) d->flags = newFlags; // Notify interested parties of the change. - DENG2_FOR_AUDIENCE(FlagsChange, i) i->lineFlagsChanged(*this, oldFlags); + DE_FOR_AUDIENCE(FlagsChange, i) i->lineFlagsChanged(*this, oldFlags); } } @@ -1242,13 +1242,13 @@ void Line::replaceVertex(dint to, Vertex &newVertex) Vertex &Line::vertex(dint to) { - DENG2_ASSERT((to ? d->to : d->from) != nullptr); + DE_ASSERT((to ? d->to : d->from) != nullptr); return (to ? *d->to : *d->from); } Vertex const &Line::vertex(dint to) const { - DENG2_ASSERT((to ? d->to : d->from) != nullptr); + DE_ASSERT((to ? d->to : d->from) != nullptr); return (to ? *d->to : *d->from); } @@ -1429,7 +1429,7 @@ bool Line::isShadowCaster() const LineOwner *Line::vertexOwner(dint to) const { - DENG2_ASSERT((to ? _vo2 : _vo1) != nullptr); + DE_ASSERT((to ? _vo2 : _vo1) != nullptr); return (to ? _vo2 : _vo1); } @@ -1515,7 +1515,7 @@ dint Line::setProperty(DmuArgs const &args) D_CMD(InspectLine) { - DENG2_UNUSED(src); + DE_UNUSED(src); LOG_AS("inspectline (Cmd)"); diff --git a/doomsday/apps/client/src/world/base/linesighttest.cpp b/doomsday/apps/client/src/world/base/linesighttest.cpp index 0244ad3023..cdc3b76c95 100644 --- a/doomsday/apps/client/src/world/base/linesighttest.cpp +++ b/doomsday/apps/client/src/world/base/linesighttest.cpp @@ -40,7 +40,7 @@ using namespace de; namespace world { -DENG2_PIMPL_NOREF(LineSightTest) +DE_PIMPL_NOREF(LineSightTest) { dint flags = 0; ///< LS_* flags @ref lineSightFlags Vec3d from; ///< Ray origin. @@ -279,11 +279,11 @@ DENG2_PIMPL_NOREF(LineSightTest) */ bool crossBspNode(BspTree const *bspTree) { - DENG2_ASSERT(bspTree); + DE_ASSERT(bspTree); while (!bspTree->isLeaf()) { - DENG2_ASSERT(bspTree->userData()); + DE_ASSERT(bspTree->userData()); auto const &bspNode = bspTree->userData()->as(); // Does the ray intersect the partition? diff --git a/doomsday/apps/client/src/world/base/map.cpp b/doomsday/apps/client/src/world/base/map.cpp index 5723b700db..5a6faceb61 100644 --- a/doomsday/apps/client/src/world/base/map.cpp +++ b/doomsday/apps/client/src/world/base/map.cpp @@ -130,10 +130,10 @@ struct EditableElements } }; -DENG2_PIMPL(Map) -, DENG2_OBSERVES(bsp::Partitioner, UnclosedSectorFound) +DE_PIMPL(Map) +, DE_OBSERVES(bsp::Partitioner, UnclosedSectorFound) #ifdef __CLIENT__ -, DENG2_OBSERVES(ThinkerData, Deletion) +, DE_OBSERVES(ThinkerData, Deletion) #endif { struct Bsp @@ -386,7 +386,7 @@ DENG2_PIMPL(Map) void unclosedSectorFound(Sector §or, Vec2d const &nearPoint) { // Notify interested parties that an unclosed sector was found. - DENG2_FOR_PUBLIC_AUDIENCE(UnclosedSectorFound, i) i->unclosedSectorFound(sector, nearPoint); + DE_FOR_PUBLIC_AUDIENCE(UnclosedSectorFound, i) i->unclosedSectorFound(sector, nearPoint); } /** @@ -397,7 +397,7 @@ DENG2_PIMPL(Map) */ void notifyOneWayWindowFound(Line &line, Sector &backFacingSector) { - DENG2_FOR_PUBLIC_AUDIENCE(OneWayWindowFound, i) i->oneWayWindowFound(line, backFacingSector); + DE_FOR_PUBLIC_AUDIENCE(OneWayWindowFound, i) i->oneWayWindowFound(line, backFacingSector); } struct testForWindowEffectParams @@ -569,8 +569,8 @@ DENG2_PIMPL(Map) */ bool buildBspTree() { - DENG2_ASSERT(bsp.tree == nullptr); - DENG2_ASSERT(subspaces.isEmpty()); + DE_ASSERT(bsp.tree == nullptr); + DE_ASSERT(subspaces.isEmpty()); // It begins... Time begunAt; @@ -604,7 +604,7 @@ DENG2_PIMPL(Map) // Build a new BSP tree. bsp.tree = partitioner.makeBspTree(linesToBuildFor, mesh); - DENG2_ASSERT(bsp.tree); + DE_ASSERT(bsp.tree); LOG_MAP_VERBOSE("BSP built: %s. With %d Segments and %d Vertexes.") << bsp.tree->summary() @@ -619,7 +619,7 @@ DENG2_PIMPL(Map) vtx->setIndexInMap(i); } -#ifdef DENG2_QT_4_7_OR_NEWER +#ifdef DE_QT_4_7_OR_NEWER /// @todo Determine the actual number of subspaces needed. subspaces.reserve(bsp.tree->leafCount()); #endif @@ -649,7 +649,7 @@ DENG2_PIMPL(Map) subspace.setIndexInMap(subspaces.count()); subspaces.append(&subspace); -#ifdef DENG_DEBUG // See if we received a partial geometry... +#ifdef DE_DEBUG // See if we received a partial geometry... dint discontinuities = 0; HEdge *hedge = subspace.poly().hedge(); do @@ -718,7 +718,7 @@ DENG2_PIMPL(Map) */ void buildSubsectors(Sector §or) { - DENG2_ASSERT(!sector.hasSubsectors()); + DE_ASSERT(!sector.hasSubsectors()); // Group the subspaces into sets which share at least one common edge. We'll do // this by starting with a set per subspace and then keep merging the sets until @@ -795,7 +795,7 @@ DENG2_PIMPL(Map) for (Subspaces const &subspaceSet : subspaceSets) { Subsector *subsec = sector.addSubsector(subspaceSet); - DENG2_ASSERT(subsec != nullptr); + DE_ASSERT(subsec != nullptr); subsectorsById.insert(subsec->id(), subsec); } } @@ -1352,7 +1352,7 @@ DENG2_PIMPL(Map) dint findDefForGenerator(Generator *gen) { - DENG2_ASSERT(gen); + DE_ASSERT(gen); auto &defs = *DED_Definitions(); @@ -1489,7 +1489,7 @@ DENG2_PIMPL(Map) continue; dint listIndex = pInfo->bspLeaf->sectorPtr()->indexInMap(); - DENG2_ASSERT((unsigned)listIndex < gens.listsSize); + DE_ASSERT((unsigned)listIndex < gens.listsSize); // Must check that it isn't already there... bool found = false; @@ -2010,7 +2010,7 @@ dint Map::clMobjIterator(dint (*callback)(mobj_t *, void *), void *context) next = i; next++; - DENG2_ASSERT(THINKER_DATA(i.value()->thinker, ClientMobjThinkerData).hasRemoteSync()); + DE_ASSERT(THINKER_DATA(i.value()->thinker, ClientMobjThinkerData).hasRemoteSync()); // Callback returns zero to continue. if (dint result = callback(i.value(), context)) @@ -2232,7 +2232,7 @@ LineSide *Map::sidePtr(dint index) const dint Map::toSideIndex(dint lineIndex, dint backSide) // static { - DENG_ASSERT(lineIndex >= 0); + DE_ASSERT(lineIndex >= 0); return lineIndex * 2 + (backSide? 1 : 0); } @@ -2278,7 +2278,7 @@ void Map::initNodePiles() NP_Init(&d->lineNodes, lineCount() + 1000); // Allocate the rings. - DENG_ASSERT(d->lineLinks == nullptr); + DE_ASSERT(d->lineLinks == nullptr); d->lineLinks = (nodeindex_t *) Z_Malloc(sizeof(*d->lineLinks) * lineCount(), PU_MAPSTATIC, 0); for (dint i = 0; i < lineCount(); ++i) @@ -2920,13 +2920,13 @@ dint Map::lumobjCount() const Lumobj &Map::addLumobj(Lumobj *lumobj) { - DENG2_ASSERT(lumobj != nullptr); + DE_ASSERT(lumobj != nullptr); d->lumobjs.append(lumobj); lumobj->setMap(this); lumobj->setIndexInMap(d->lumobjs.count() - 1); - DENG2_ASSERT(lumobj->bspLeafAtOrigin().hasSubspace()); + DE_ASSERT(lumobj->bspLeafAtOrigin().hasSubspace()); lumobj->bspLeafAtOrigin().subspace().link(*lumobj); R_AddContact(*lumobj); // For spreading purposes. @@ -3163,23 +3163,24 @@ void Map::restoreObjects(Info const &objState, IThinkerMapping const &thinkerMap { Info::BlockElement const &state = (*i)->as(); Id::Type const privateId = state.name().toUInt32(); - DENG2_ASSERT(privateId != 0); + DE_ASSERT(privateId != 0); if (thinker_t *th = thinkerMapping.thinkerForPrivateId(privateId)) { if (ThinkerData *found = ThinkerData::find(privateId)) { - DENG2_ASSERT(&found->thinker() == th); + DE_ASSERT(&found->thinker() == th); // Restore the state according to the serialized info. gx.MobjRestoreState(found->as().mobj(), state); + #if defined (DE_DEBUG) // Verify that the state is now correct. { Info const currentDesc(gx.MobjStateAsInfo(found->as().mobj())); Info::BlockElement const ¤tState = currentDesc.root().contentsInOrder() .first()->as(); - DENG2_ASSERT(currentState.name() == state.name()); + DE_ASSERT(currentState.name() == state.name()); foreach (String const &key, state.contents().keys()) { if (state.keyValue(key).text != currentState.keyValue(key).text) @@ -3194,6 +3195,7 @@ void Map::restoreObjects(Info const &objState, IThinkerMapping const &thinkerMap } } } + #endif } else { @@ -3278,7 +3280,7 @@ void Map::deserializeInternalState(Reader &from, IThinkerMapping const &thinkerM else { LOG_MAP_WARNING("State for thinker %i is not deserializable " - DENG2_CHAR_MDASH " internal representation may have " + DE_CHAR_MDASH " internal representation may have " "changed, or save data is corrupt") << id; } } @@ -3300,7 +3302,7 @@ void Map::deserializeInternalState(Reader &from, IThinkerMapping const &thinkerM void Map::worldSystemFrameBegins(bool resetNextViewer) { - DENG2_ASSERT(&App_World().map() == this); // Sanity check. + DE_ASSERT(&App_World().map() == this); // Sanity check. // Interpolate the map ready for drawing view(s) of it. d->lerpTrackedPlanes(resetNextViewer); @@ -3368,7 +3370,7 @@ static dint expireClMobjsWorker(mobj_t *mob, void *context) if (mob->dPlayer) return 0; ClientMobjThinkerData::RemoteSync *info = ClMobj_GetInfo(mob); - DENG2_ASSERT(info); + DE_ASSERT(info); if ((info->flags & (CLMF_UNPREDICTABLE | CLMF_HIDDEN | CLMF_NULLED)) || !mob->info) { @@ -3443,7 +3445,7 @@ String Map::objectSummaryAsStyledText() const D_CMD(InspectMap) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); LOG_AS("inspectmap (Cmd)"); @@ -3709,7 +3711,7 @@ static void setVertexLineOwner(Vertex *vtx, Line *lineptr, LineOwner **storage) lineptr->_vo2 = newOwner; } -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG /** * Determines whether the specified vertex @a v has a correctly formed line owner ring. */ @@ -3781,7 +3783,7 @@ void buildVertexLineOwnerRings(QList const &vertexs, QList &ed // Set the angle of the last owner. last->_angle = last->angle() - firstAngle; -/*#ifdef DENG2_DEBUG +/*#ifdef DE_DEBUG LOG_MAP_VERBOSE("Vertex #%i: line owners #%i") << editmap.vertexes.indexOf(v) << v->lineOwnerCount(); @@ -3799,7 +3801,7 @@ void buildVertexLineOwnerRings(QList const &vertexs, QList &ed #endif*/ // Sanity check. - DENG2_ASSERT(vertexHasValidLineOwnerRing(*v)); + DE_ASSERT(vertexHasValidLineOwnerRing(*v)); } } @@ -3817,7 +3819,7 @@ struct VertexInfo /// @todo Math here is not correct (rounding directionality). -ds dint compareVertexOrigins(VertexInfo const &other) const { - DENG2_ASSERT(vertex && other.vertex); + DE_ASSERT(vertex && other.vertex); if (this == &other) return 0; if (vertex == other.vertex) return 0; @@ -3965,24 +3967,24 @@ bool Map::endEditing() // Move the editable elements to the "static" element lists. // // Collate sectors: - DENG2_ASSERT(d->sectors.isEmpty()); -#ifdef DENG2_QT_4_7_OR_NEWER + DE_ASSERT(d->sectors.isEmpty()); +#ifdef DE_QT_4_7_OR_NEWER d->sectors.reserve(d->editable.sectors.count()); #endif d->sectors.append(d->editable.sectors); d->editable.sectors.clear(); // Collate lines: - DENG2_ASSERT(d->lines.isEmpty()); -#ifdef DENG2_QT_4_7_OR_NEWER + DE_ASSERT(d->lines.isEmpty()); +#ifdef DE_QT_4_7_OR_NEWER d->lines.reserve(d->editable.lines.count()); #endif d->lines.append(d->editable.lines); d->editable.lines.clear(); // Collate polyobjs: - DENG2_ASSERT(d->polyobjs.isEmpty()); -#ifdef DENG2_QT_4_7_OR_NEWER + DE_ASSERT(d->polyobjs.isEmpty()); +#ifdef DE_QT_4_7_OR_NEWER d->polyobjs.reserve(d->editable.polyobjs.count()); #endif while (!d->editable.polyobjs.isEmpty()) @@ -4002,7 +4004,7 @@ bool Map::endEditing() #ifdef __CLIENT__ seg->setLength(line->length()); #else - DENG2_UNUSED(seg); + DE_UNUSED(seg); #endif } diff --git a/doomsday/apps/client/src/world/base/maputil.cpp b/doomsday/apps/client/src/world/base/maputil.cpp index 0e74b8a809..8411a1a6fe 100644 --- a/doomsday/apps/client/src/world/base/maputil.cpp +++ b/doomsday/apps/client/src/world/base/maputil.cpp @@ -47,7 +47,7 @@ lineopening_s::lineopening_s(Line const &line) Sector const *frontSector = line.front().sectorPtr(); Sector const *backSector = line.back().sectorPtr(); - DENG_ASSERT(frontSector != 0); + DE_ASSERT(frontSector != 0); if(backSector && backSector->ceiling().height() < frontSector->ceiling().height()) { @@ -218,7 +218,7 @@ Line *R_FindLineNeighbor(Line const &line, LineOwner const &own, ClockDirection } // Not suitable, try the next. - DENG2_ASSERT(cown); + DE_ASSERT(cown); return R_FindLineNeighbor(line, *cown, direction, sector, diff); } @@ -274,7 +274,7 @@ static bool middleMaterialCoversOpening(LineSide const &side) Line *R_FindSolidLineNeighbor(Line const &line, LineOwner const &own, ClockDirection direction, Sector const *sector, binangle_t *diff) { - DENG2_ASSERT(sector); + DE_ASSERT(sector); LineOwner const *cown = (direction == Anticlockwise ? own.prev() : own.next()); Line *other = &cown->line(); @@ -309,7 +309,7 @@ Line *R_FindSolidLineNeighbor(Line const &line, LineOwner const &own, ClockDirec } // Not suitable, try the next. - DENG2_ASSERT(cown); + DE_ASSERT(cown); return R_FindSolidLineNeighbor(line, *cown, direction, sector, diff); } diff --git a/doomsday/apps/client/src/world/base/p_mobj.cpp b/doomsday/apps/client/src/world/base/p_mobj.cpp index 6792a7d9e1..8254c1ecb9 100644 --- a/doomsday/apps/client/src/world/base/p_mobj.cpp +++ b/doomsday/apps/client/src/world/base/p_mobj.cpp @@ -101,7 +101,7 @@ mobj_t *P_MobjCreate(thinkfunc_t function, Vec3d const &origin, angle_t angle, if (!function) App_Error("P_MobjCreate: Think function invalid, cannot create mobj."); -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG if (::isClient) { LOG_VERBOSE("P_MobjCreate: Client creating mobj at %s") @@ -142,7 +142,7 @@ mobj_t *P_MobjCreate(thinkfunc_t function, Vec3d const &origin, angle_t angle, * awaiting removal (which occurs when its turn for thinking comes around). */ #undef Mobj_Destroy -DENG_EXTERN_C void Mobj_Destroy(mobj_t *mo) +DE_EXTERN_C void Mobj_Destroy(mobj_t *mo) { #ifdef _DEBUG if (mo->ddFlags & DDMF_MISSILE) @@ -180,13 +180,13 @@ bool Mobj_IsSectorLinked(mobj_t const &mob) } #undef Mobj_SetState -DENG_EXTERN_C void Mobj_SetState(mobj_t *mob, int statenum) +DE_EXTERN_C void Mobj_SetState(mobj_t *mob, int statenum) { if (!mob) return; state_t const *oldState = mob->state; - DENG2_ASSERT(statenum >= 0 && statenum < DED_Definitions()->states.size()); + DE_ASSERT(statenum >= 0 && statenum < DED_Definitions()->states.size()); mob->state = &runtimeDefs.states[statenum]; mob->tics = mob->state->tics; @@ -233,7 +233,7 @@ dd_bool Mobj_SetOrigin(struct mobj_s *mob, coord_t x, coord_t y, coord_t z) } #undef Mobj_OriginSmoothed -DENG_EXTERN_C void Mobj_OriginSmoothed(mobj_t *mob, coord_t origin[3]) +DE_EXTERN_C void Mobj_OriginSmoothed(mobj_t *mob, coord_t origin[3]) { if (!origin) return; @@ -311,7 +311,7 @@ Subsector *Mobj_SubsectorPtr(mobj_t const &mob) } #undef Mobj_Sector -DENG_EXTERN_C Sector *Mobj_Sector(mobj_t const *mob) +DE_EXTERN_C Sector *Mobj_Sector(mobj_t const *mob) { if (!mob || !Mobj_IsLinked(*mob)) return nullptr; return Mobj_BspLeafAtOrigin(*mob).sectorPtr(); @@ -320,7 +320,7 @@ DENG_EXTERN_C Sector *Mobj_Sector(mobj_t const *mob) void Mobj_SpawnParticleGen(mobj_t *mob, ded_ptcgen_t const *def) { #ifdef __CLIENT__ - DENG2_ASSERT(mob && def); + DE_ASSERT(mob && def); //if (!useParticles) return; @@ -350,12 +350,12 @@ void Mobj_SpawnParticleGen(mobj_t *mob, ded_ptcgen_t const *def) // Is there a need to pre-simulate? gen->presimulate(def->preSim); #else - DENG2_UNUSED2(mob, def); + DE_UNUSED(mob, def); #endif } #undef Mobj_SpawnDamageParticleGen -DENG_EXTERN_C void Mobj_SpawnDamageParticleGen(mobj_t const *mob, mobj_t const *inflictor, int amount) +DE_EXTERN_C void Mobj_SpawnDamageParticleGen(mobj_t const *mob, mobj_t const *inflictor, int amount) { #ifdef __CLIENT__ if (!mob || !inflictor || amount <= 0) return; @@ -399,7 +399,7 @@ DENG_EXTERN_C void Mobj_SpawnDamageParticleGen(mobj_t const *mob, mobj_t const * gen->presimulate(def->preSim); } #else - DENG2_UNUSED3(mob, inflictor, amount); + DE_UNUSED(mob, inflictor, amount); #endif } @@ -632,7 +632,7 @@ dfloat Mobj_ShadowStrength(mobj_t const &mob) if (TextureVariant const *texture = matAnimator.texUnit(MaterialAnimator::TU_LAYER0).texture) { auto const *aa = (averagealpha_analysis_t const *)texture->base().analysisDataPointer(res::Texture::AverageAlphaAnalysis); - DENG2_ASSERT(aa); + DE_ASSERT(aa); // We use an average which factors in the coverage ratio of // alpha:non-alpha pixels. @@ -808,7 +808,7 @@ FrameModelDef *Mobj_ModelDef(mobj_t const &mo, FrameModelDef **retNextModef, flo #endif // __CLIENT__ #undef Mobj_AngleSmoothed -DENG_EXTERN_C angle_t Mobj_AngleSmoothed(mobj_t *mob) +DE_EXTERN_C angle_t Mobj_AngleSmoothed(mobj_t *mob) { if (!mob) return 0; @@ -931,7 +931,7 @@ AABoxd Mobj_Bounds(mobj_t const &mobj) D_CMD(InspectMobj) { - DENG2_UNUSED(src); + DE_UNUSED(src); if (argc != 2) { diff --git a/doomsday/apps/client/src/world/base/p_players.cpp b/doomsday/apps/client/src/world/base/p_players.cpp index f7570dc140..03cd395505 100644 --- a/doomsday/apps/client/src/world/base/p_players.cpp +++ b/doomsday/apps/client/src/world/base/p_players.cpp @@ -17,7 +17,7 @@ * http://www.gnu.org/licenses */ -#define DENG_NO_API_MACROS_PLAYER +#define DE_NO_API_MACROS_PLAYER #include "world/p_players.h" @@ -237,7 +237,7 @@ PlayerImpulse *P_PlayerImpulseByName(String const &name) D_CMD(ListImpulses) { - DENG2_UNUSED3(argv, argc, src); + DE_UNUSED(argv, argc, src); // Group the defined impulses by binding context. typedef QList ImpulseList; @@ -276,7 +276,7 @@ D_CMD(ListImpulses) D_CMD(Impulse) { - DENG2_UNUSED(src); + DE_UNUSED(src); if(argc < 2 || argc > 3) { @@ -300,7 +300,7 @@ D_CMD(Impulse) #ifdef __CLIENT__ D_CMD(ClearImpulseAccumulation) { - DENG2_UNUSED3(argv, argc, src); + DE_UNUSED(argv, argc, src); ClientApp::inputSystem().forAllDevices([] (InputDevice &device) { @@ -332,7 +332,7 @@ void P_ConsoleRegister() } #undef DD_GetPlayer -DENG_EXTERN_C ddplayer_t *DD_GetPlayer(int number) +DE_EXTERN_C ddplayer_t *DD_GetPlayer(int number) { return &DD_Player(number)->publicData(); } @@ -341,15 +341,15 @@ DENG_EXTERN_C ddplayer_t *DD_GetPlayer(int number) #undef Net_GetPlayerName #undef Net_GetPlayerID #undef Net_PlayerSmoother -DENG_EXTERN_C char const *Net_GetPlayerName(int player); -DENG_EXTERN_C ident_t Net_GetPlayerID(int player); -DENG_EXTERN_C Smoother *Net_PlayerSmoother(int player); +DE_EXTERN_C char const *Net_GetPlayerName(int player); +DE_EXTERN_C ident_t Net_GetPlayerID(int player); +DE_EXTERN_C Smoother *Net_PlayerSmoother(int player); #undef P_NewPlayerControl -DENG_EXTERN_C void P_NewPlayerControl(int id, impulsetype_t type, char const *name, +DE_EXTERN_C void P_NewPlayerControl(int id, impulsetype_t type, char const *name, char const *bindContextName) { - DENG2_ASSERT(name && bindContextName); + DE_ASSERT(name && bindContextName); LOG_AS("P_NewPlayerControl"); // Ensure the given id is unique. @@ -371,7 +371,7 @@ DENG_EXTERN_C void P_NewPlayerControl(int id, impulsetype_t type, char const *na } #undef P_IsControlBound -DENG_EXTERN_C int P_IsControlBound(int playerNum, int impulseId) +DE_EXTERN_C int P_IsControlBound(int playerNum, int impulseId) { #ifdef __CLIENT__ LOG_AS("P_IsControlBound"); @@ -414,13 +414,13 @@ DENG_EXTERN_C int P_IsControlBound(int playerNum, int impulseId) return false; #else - DENG2_UNUSED2(playerNum, impulseId); + DE_UNUSED(playerNum, impulseId); return 0; #endif } #undef P_GetControlState -DENG_EXTERN_C void P_GetControlState(int playerNum, int impulseId, float *pos, +DE_EXTERN_C void P_GetControlState(int playerNum, int impulseId, float *pos, float *relativeOffset) { #ifdef __CLIENT__ @@ -437,12 +437,12 @@ DENG_EXTERN_C void P_GetControlState(int playerNum, int impulseId, float *pos, accum->takeAnalog(pos, relativeOffset); } #else - DENG2_UNUSED4(playerNum, impulseId, pos, relativeOffset); + DE_UNUSED(playerNum, impulseId, pos, relativeOffset); #endif } #undef P_GetImpulseControlState -DENG_EXTERN_C int P_GetImpulseControlState(int playerNum, int impulseId) +DE_EXTERN_C int P_GetImpulseControlState(int playerNum, int impulseId) { LOG_AS("P_GetImpulseControlState"); @@ -460,7 +460,7 @@ DENG_EXTERN_C int P_GetImpulseControlState(int playerNum, int impulseId) } #undef P_Impulse -DENG_EXTERN_C void P_Impulse(int playerNum, int impulseId) +DE_EXTERN_C void P_Impulse(int playerNum, int impulseId) { LOG_AS("P_Impulse"); @@ -477,7 +477,7 @@ DENG_EXTERN_C void P_Impulse(int playerNum, int impulseId) accum->receiveBinary(); } -DENG_DECLARE_API(Player) = +DE_DECLARE_API(Player) = { { DE_API_PLAYER }, Net_GetPlayerName, diff --git a/doomsday/apps/client/src/world/base/plane.cpp b/doomsday/apps/client/src/world/base/plane.cpp index ab04d37be1..2ed29d164a 100644 --- a/doomsday/apps/client/src/world/base/plane.cpp +++ b/doomsday/apps/client/src/world/base/plane.cpp @@ -42,9 +42,9 @@ using namespace de; using namespace world; -DENG2_PIMPL(Plane) +DE_PIMPL(Plane) #ifdef __CLIENT__ -, DENG2_OBSERVES(Surface, MaterialChange) +, DE_OBSERVES(Surface, MaterialChange) #endif { Surface surface; @@ -74,7 +74,7 @@ DENG2_PIMPL(Plane) ~Impl() { - DENG2_FOR_PUBLIC_AUDIENCE2(Deletion, i) i->planeBeingDeleted(self()); + DE_FOR_PUBLIC_AUDIENCE2(Deletion, i) i->planeBeingDeleted(self()); #ifdef __CLIENT__ // Stop movement tracking of this plane. @@ -139,19 +139,19 @@ DENG2_PIMPL(Plane) void notifyHeightChanged() { - DENG2_FOR_PUBLIC_AUDIENCE2(HeightChange, i) i->planeHeightChanged(self()); + DE_FOR_PUBLIC_AUDIENCE2(HeightChange, i) i->planeHeightChanged(self()); } #ifdef __CLIENT__ void notifySmoothedHeightChanged() { - DENG2_FOR_PUBLIC_AUDIENCE2(HeightSmoothedChange, i) i->planeHeightSmoothedChanged(self()); + DE_FOR_PUBLIC_AUDIENCE2(HeightSmoothedChange, i) i->planeHeightSmoothedChanged(self()); } void surfaceMaterialChanged(Surface &suf) { - DENG2_ASSERT(&suf == &surface); - DENG2_UNUSED(suf); + DE_ASSERT(&suf == &surface); + DE_UNUSED(suf); if (!::ddMapSetup && surface.hasMaterial()) { de::Uri uri = surface.material().manifest().composeUri(); @@ -160,17 +160,17 @@ DENG2_PIMPL(Plane) } #endif - DENG2_PIMPL_AUDIENCE(Deletion) - DENG2_PIMPL_AUDIENCE(HeightChange) + DE_PIMPL_AUDIENCE(Deletion) + DE_PIMPL_AUDIENCE(HeightChange) #ifdef __CLIENT__ - DENG2_PIMPL_AUDIENCE(HeightSmoothedChange) + DE_PIMPL_AUDIENCE(HeightSmoothedChange) #endif }; -DENG2_AUDIENCE_METHOD(Plane, Deletion) -DENG2_AUDIENCE_METHOD(Plane, HeightChange) +DE_AUDIENCE_METHOD(Plane, Deletion) +DE_AUDIENCE_METHOD(Plane, HeightChange) #ifdef __CLIENT__ -DENG2_AUDIENCE_METHOD(Plane, HeightSmoothedChange) +DE_AUDIENCE_METHOD(Plane, HeightSmoothedChange) #endif Plane::Plane(Sector §or, Vec3f const &normal, ddouble height) @@ -192,7 +192,7 @@ String Plane::description() const .arg(heightTarget()) .arg(speed()); - DENG2_DEBUG_ONLY( + DE_DEBUG_ONLY( desc.prepend(String(_E(b) "Plane " _E(.) "[0x%1]\n").arg(de::dintptr(this), 0, 16)); ) return desc + "\n" + surface().description(); @@ -407,7 +407,7 @@ void Plane::addMover(ClPlaneMover &mover) map().thinkers().remove(d->mover->thinker()); - DENG2_ASSERT(!d->mover); + DE_ASSERT(!d->mover); } d->mover = &mover; diff --git a/doomsday/apps/client/src/world/base/polyobj.cpp b/doomsday/apps/client/src/world/base/polyobj.cpp index 96e8528b79..126ea75bd1 100644 --- a/doomsday/apps/client/src/world/base/polyobj.cpp +++ b/doomsday/apps/client/src/world/base/polyobj.cpp @@ -76,7 +76,7 @@ static void notifyGeometryChanged(Polyobj &pob) } } #else // !__CLIENT__ - DENG2_UNUSED(pob); + DE_UNUSED(pob); #endif } #endif diff --git a/doomsday/apps/client/src/world/base/polyobjdata.cpp b/doomsday/apps/client/src/world/base/polyobjdata.cpp index 962263c1e1..039423497f 100644 --- a/doomsday/apps/client/src/world/base/polyobjdata.cpp +++ b/doomsday/apps/client/src/world/base/polyobjdata.cpp @@ -61,7 +61,7 @@ void PolyobjData::addMover(ClPolyMover &mover) if(_mover) { Thinker_Map(_mover->thinker()).thinkers().remove(_mover->thinker()); - DENG2_ASSERT(!_mover); + DE_ASSERT(!_mover); } _mover = &mover; diff --git a/doomsday/apps/client/src/world/base/sector.cpp b/doomsday/apps/client/src/world/base/sector.cpp index d6d6bfa246..24da44b5ff 100644 --- a/doomsday/apps/client/src/world/base/sector.cpp +++ b/doomsday/apps/client/src/world/base/sector.cpp @@ -42,8 +42,8 @@ using namespace world; static Sector::SubsectorConstructor subsectorConstructor; -DENG2_PIMPL(Sector) -, DENG2_OBSERVES(Plane, HeightChange) +DE_PIMPL(Sector) +, DE_OBSERVES(Plane, HeightChange) { /** * POD: Metrics describing the geometry of the sector (the subsectors). @@ -78,7 +78,7 @@ DENG2_PIMPL(Sector) if (!mob) return; // Ensure this isn't already included. - DENG2_ASSERT(!contains(mob)); + DE_ASSERT(!contains(mob)); // Prev pointers point to the pointer that points back to us. // (Which practically disallows traversing the list backwards.) @@ -109,7 +109,7 @@ DENG2_PIMPL(Sector) mob->sPrev = nullptr; // Ensure this has been completely unlinked. - DENG2_ASSERT(!contains(mob)); + DE_ASSERT(!contains(mob)); } }; @@ -249,12 +249,12 @@ DENG2_PIMPL(Sector) } } - DENG2_PIMPL_AUDIENCE(LightLevelChange) - DENG2_PIMPL_AUDIENCE(LightColorChange) + DE_PIMPL_AUDIENCE(LightLevelChange) + DE_PIMPL_AUDIENCE(LightColorChange) }; -DENG2_AUDIENCE_METHOD(Sector, LightLevelChange) -DENG2_AUDIENCE_METHOD(Sector, LightColorChange) +DE_AUDIENCE_METHOD(Sector, LightLevelChange) +DE_AUDIENCE_METHOD(Sector, LightColorChange) Sector::Sector(dfloat lightLevel, Vec3f const &lightColor) : MapElement(DMU_SECTOR) @@ -360,7 +360,7 @@ LoopResult Sector::forAllSubsectors(const std::function Subsector *Sector::addSubsector(QVector const &subspaces) { - DENG2_ASSERT(subsectorConstructor); + DE_ASSERT(subsectorConstructor); /// @todo Add/move debug logic for ensuring the set is valid here. -ds std::unique_ptr subsec(subsectorConstructor(subspaces)); d->subsectors << subsec.get(); @@ -481,7 +481,7 @@ void Sector::setLightLevel(dfloat newLightLevel) if (!de::fequal(d->lightLevel, newLightLevel)) { d->lightLevel = newLightLevel; - DENG2_FOR_AUDIENCE2(LightLevelChange, i) i->sectorLightLevelChanged(*this); + DE_FOR_AUDIENCE2(LightLevelChange, i) i->sectorLightLevelChanged(*this); } } @@ -496,7 +496,7 @@ void Sector::setLightColor(Vec3f const &newLightColor) if (d->lightColor != newColorClamped) { d->lightColor = newColorClamped; - DENG2_FOR_AUDIENCE2(LightColorChange, i) i->sectorLightColorChanged(*this); + DE_FOR_AUDIENCE2(LightColorChange, i) i->sectorLightColorChanged(*this); } } @@ -611,7 +611,7 @@ dint Sector::setProperty(DmuArgs const &args) D_CMD(InspectSector) { - DENG2_UNUSED(src); + DE_UNUSED(src); LOG_AS("inspectsector (Cmd)"); diff --git a/doomsday/apps/client/src/world/base/sky.cpp b/doomsday/apps/client/src/world/base/sky.cpp index 71a7fe3395..e29bc458a4 100644 --- a/doomsday/apps/client/src/world/base/sky.cpp +++ b/doomsday/apps/client/src/world/base/sky.cpp @@ -42,7 +42,7 @@ using namespace de; namespace world { -DENG2_PIMPL_NOREF(Sky::Layer) +DE_PIMPL_NOREF(Sky::Layer) { bool active = false; bool masked = false; @@ -53,14 +53,14 @@ DENG2_PIMPL_NOREF(Sky::Layer) Sky &sky; Impl(Sky &sky) : sky(sky) {} - DENG2_PIMPL_AUDIENCE(ActiveChange) - DENG2_PIMPL_AUDIENCE(MaskedChange) - DENG2_PIMPL_AUDIENCE(MaterialChange) + DE_PIMPL_AUDIENCE(ActiveChange) + DE_PIMPL_AUDIENCE(MaskedChange) + DE_PIMPL_AUDIENCE(MaterialChange) }; -DENG2_AUDIENCE_METHOD(Sky::Layer, ActiveChange) -DENG2_AUDIENCE_METHOD(Sky::Layer, MaskedChange) -DENG2_AUDIENCE_METHOD(Sky::Layer, MaterialChange) +DE_AUDIENCE_METHOD(Sky::Layer, ActiveChange) +DE_AUDIENCE_METHOD(Sky::Layer, MaskedChange) +DE_AUDIENCE_METHOD(Sky::Layer, MaterialChange) Sky::Layer::Layer(Sky &sky, Material *material) : d(new Impl(sky)) { @@ -82,7 +82,7 @@ void Sky::Layer::setActive(bool yes) if(d->active != yes) { d->active = yes; - DENG2_FOR_AUDIENCE2(ActiveChange, i) i->skyLayerActiveChanged(*this); + DE_FOR_AUDIENCE2(ActiveChange, i) i->skyLayerActiveChanged(*this); } } @@ -96,7 +96,7 @@ void Sky::Layer::setMasked(bool yes) if(d->masked != yes) { d->masked = yes; - DENG2_FOR_AUDIENCE2(MaskedChange, i) i->skyLayerMaskedChanged(*this); + DE_FOR_AUDIENCE2(MaskedChange, i) i->skyLayerMaskedChanged(*this); } } @@ -110,7 +110,7 @@ void Sky::Layer::setMaterial(Material *newMaterial) if(d->material != newMaterial) { d->material = newMaterial; - DENG2_FOR_AUDIENCE2(MaterialChange, i) i->skyLayerMaterialChanged(*this); + DE_FOR_AUDIENCE2(MaterialChange, i) i->skyLayerMaterialChanged(*this); } } @@ -138,11 +138,11 @@ void Sky::Layer::setFadeoutLimit(dfloat newLimit) static Vec3f const AmbientLightColorDefault(1, 1, 1); // Pure white. #endif -DENG2_PIMPL(Sky) +DE_PIMPL(Sky) #ifdef __CLIENT__ -, DENG2_OBSERVES(Layer, ActiveChange) -, DENG2_OBSERVES(Layer, MaterialChange) -, DENG2_OBSERVES(Layer, MaskedChange) +, DE_OBSERVES(Layer, ActiveChange) +, DE_OBSERVES(Layer, MaterialChange) +, DE_OBSERVES(Layer, MaskedChange) #endif { struct Layers : public QList @@ -172,7 +172,7 @@ DENG2_PIMPL(Sky) ~Impl() { - DENG2_FOR_PUBLIC_AUDIENCE2(Deletion, i) i->skyBeingDeleted(self()); + DE_FOR_PUBLIC_AUDIENCE2(Deletion, i) i->skyBeingDeleted(self()); } #ifdef __CLIENT__ @@ -308,14 +308,14 @@ DENG2_PIMPL(Sky) #endif // __CLIENT__ - DENG2_PIMPL_AUDIENCE(Deletion) - DENG2_PIMPL_AUDIENCE(HeightChange) - DENG2_PIMPL_AUDIENCE(HorizonOffsetChange) + DE_PIMPL_AUDIENCE(Deletion) + DE_PIMPL_AUDIENCE(HeightChange) + DE_PIMPL_AUDIENCE(HorizonOffsetChange) }; -DENG2_AUDIENCE_METHOD(Sky, Deletion) -DENG2_AUDIENCE_METHOD(Sky, HeightChange) -DENG2_AUDIENCE_METHOD(Sky, HorizonOffsetChange) +DE_AUDIENCE_METHOD(Sky, Deletion) +DE_AUDIENCE_METHOD(Sky, HeightChange) +DE_AUDIENCE_METHOD(Sky, HorizonOffsetChange) Sky::Sky(defn::Sky const *definition) : MapElement(DMU_SKY) @@ -443,7 +443,7 @@ void Sky::setHeight(dfloat newHeight) if(!de::fequal(d->height, newHeight)) { d->height = newHeight; - DENG2_FOR_AUDIENCE2(HeightChange, i) i->skyHeightChanged(*this); + DE_FOR_AUDIENCE2(HeightChange, i) i->skyHeightChanged(*this); } } @@ -457,7 +457,7 @@ void Sky::setHorizonOffset(dfloat newOffset) if(!de::fequal(d->horizonOffset, newOffset)) { d->horizonOffset = newOffset; - DENG2_FOR_AUDIENCE2(HorizonOffsetChange, i) i->skyHorizonOffsetChanged(*this); + DE_FOR_AUDIENCE2(HorizonOffsetChange, i) i->skyHorizonOffsetChanged(*this); } } diff --git a/doomsday/apps/client/src/world/base/subsector.cpp b/doomsday/apps/client/src/world/base/subsector.cpp index 65fd2d87ae..ffd7437e34 100644 --- a/doomsday/apps/client/src/world/base/subsector.cpp +++ b/doomsday/apps/client/src/world/base/subsector.cpp @@ -37,7 +37,7 @@ using namespace de; namespace world { -DENG2_PIMPL_NOREF(Subsector) +DE_PIMPL_NOREF(Subsector) { QVector subspaces; std::unique_ptr bounds; @@ -80,7 +80,7 @@ Subsector::Subsector(QVector const &subspaces) : d(new Impl) Subsector::~Subsector() { - DENG2_FOR_AUDIENCE(Deletion, i) i->subsectorBeingDeleted(*this); + DE_FOR_AUDIENCE(Deletion, i) i->subsectorBeingDeleted(*this); } String Subsector::description() const @@ -92,7 +92,7 @@ String Subsector::description() const .arg(sector().indexInMap()) .arg(Rectangled(bounds().min, bounds().max).asText()); - DENG2_DEBUG_ONLY( + DE_DEBUG_ONLY( desc.prepend(String(_E(b) "Subsector " _E(.) "[0x%1]\n").arg(de::dintptr(this), 0, 16)); ) return desc; @@ -108,7 +108,7 @@ Sector &Subsector::sector() if (!d->sector) { d->sector = firstSubspace().bspLeaf().sectorPtr(); - DENG2_ASSERT(d->sector); + DE_ASSERT(d->sector); } return *d->sector; } @@ -118,7 +118,7 @@ Sector const &Subsector::sector() const if (!d->sector) { d->sector = firstSubspace().bspLeaf().sectorPtr(); - DENG2_ASSERT(d->sector); + DE_ASSERT(d->sector); } return *d->sector; } @@ -130,7 +130,7 @@ dint Subsector::subspaceCount() const ConvexSubspace &Subsector::firstSubspace() const { - DENG2_ASSERT(!d->subspaces.isEmpty()); + DE_ASSERT(!d->subspaces.isEmpty()); return *d.getConst()->subspaces.first(); } diff --git a/doomsday/apps/client/src/world/base/surface.cpp b/doomsday/apps/client/src/world/base/surface.cpp index db4776e65c..9115042d06 100644 --- a/doomsday/apps/client/src/world/base/surface.cpp +++ b/doomsday/apps/client/src/world/base/surface.cpp @@ -46,7 +46,7 @@ using namespace de; using namespace world; -#ifdef DENG_DEBUG +#ifdef DE_DEBUG static inline bool Surface_isSideMiddle(Surface const &suf) { return suf.parent().type() == DMU_SIDE @@ -61,7 +61,7 @@ static inline bool Surface_isSectorExtraPlane(Surface const &suf) } #endif -DENG2_PIMPL(Surface) +DE_PIMPL(Surface) { dint flags = 0; ///< @ref sufFlags @@ -96,7 +96,7 @@ DENG2_PIMPL(Surface) inline MapElement &owner() const { return self().parent(); } -#ifdef DENG_DEBUG +#ifdef DE_DEBUG bool isSideMiddle() const { return owner().type() == DMU_SIDE @@ -126,27 +126,27 @@ DENG2_PIMPL(Surface) #ifdef __CLIENT__ void notifyOriginSmoothedChanged() { - DENG2_FOR_PUBLIC_AUDIENCE2(OriginSmoothedChange, i) i->surfaceOriginSmoothedChanged(self()); + DE_FOR_PUBLIC_AUDIENCE2(OriginSmoothedChange, i) i->surfaceOriginSmoothedChanged(self()); } #endif - DENG2_PIMPL_AUDIENCE(ColorChange) - DENG2_PIMPL_AUDIENCE(MaterialChange) - DENG2_PIMPL_AUDIENCE(NormalChange) - DENG2_PIMPL_AUDIENCE(OpacityChange) - DENG2_PIMPL_AUDIENCE(OriginChange) + DE_PIMPL_AUDIENCE(ColorChange) + DE_PIMPL_AUDIENCE(MaterialChange) + DE_PIMPL_AUDIENCE(NormalChange) + DE_PIMPL_AUDIENCE(OpacityChange) + DE_PIMPL_AUDIENCE(OriginChange) #ifdef __CLIENT__ - DENG2_PIMPL_AUDIENCE(OriginSmoothedChange) + DE_PIMPL_AUDIENCE(OriginSmoothedChange) #endif }; -DENG2_AUDIENCE_METHOD(Surface, ColorChange) -DENG2_AUDIENCE_METHOD(Surface, MaterialChange) -DENG2_AUDIENCE_METHOD(Surface, NormalChange) -DENG2_AUDIENCE_METHOD(Surface, OpacityChange) -DENG2_AUDIENCE_METHOD(Surface, OriginChange) +DE_AUDIENCE_METHOD(Surface, ColorChange) +DE_AUDIENCE_METHOD(Surface, MaterialChange) +DE_AUDIENCE_METHOD(Surface, NormalChange) +DE_AUDIENCE_METHOD(Surface, OpacityChange) +DE_AUDIENCE_METHOD(Surface, OriginChange) #ifdef __CLIENT__ -DENG2_AUDIENCE_METHOD(Surface, OriginSmoothedChange) +DE_AUDIENCE_METHOD(Surface, OriginSmoothedChange) #endif Surface::Surface(MapElement &owner, dfloat opacity, Vec3f const &color) @@ -172,7 +172,7 @@ String Surface::description() const .arg(String(R_NameForBlendMode(blendMode()))) .arg(color().asText()); -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG desc.prepend(String(_E(b) "Surface " _E(.) "[0x%1]\n").arg(de::dintptr(this), 0, 16)); #endif return desc; @@ -201,7 +201,7 @@ Surface &Surface::setNormal(Vec3f const &newNormal) // We'll need to recalculate the tangents when next referenced. d->needUpdateTangentMatrix = true; - DENG2_FOR_AUDIENCE2(NormalChange, i) i->surfaceNormalChanged(*this); + DE_FOR_AUDIENCE2(NormalChange, i) i->surfaceNormalChanged(*this); } return *this; } @@ -231,7 +231,7 @@ Material *Surface::materialPtr() const Surface &Surface::setMaterial(Material *newMaterial, bool isMissingFix) { // Sides of selfreferencing map lines should never receive fix materials. - DENG2_ASSERT(!(isMissingFix && (parent().type() == DMU_SIDE && parent().as().line().isSelfReferencing()))); + DE_ASSERT(!(isMissingFix && (parent().type() == DMU_SIDE && parent().as().line().isSelfReferencing()))); if (d->material == newMaterial) return *this; @@ -267,7 +267,7 @@ Surface &Surface::setMaterial(Material *newMaterial, bool isMissingFix) #endif // Notify interested parties. - DENG2_FOR_AUDIENCE2(MaterialChange, i) i->surfaceMaterialChanged(*this); + DE_FOR_AUDIENCE2(MaterialChange, i) i->surfaceMaterialChanged(*this); return *this; } @@ -293,7 +293,7 @@ Surface &Surface::setOrigin(Vec2f const &newOrigin) } #endif - DENG2_FOR_AUDIENCE2(OriginChange, i) i->surfaceOriginChanged(*this); + DE_FOR_AUDIENCE2(OriginChange, i) i->surfaceOriginChanged(*this); #ifdef __CLIENT__ if (!::ddMapSetup) @@ -338,13 +338,13 @@ dfloat Surface::opacity() const Surface &Surface::setOpacity(dfloat newOpacity) { - DENG2_ASSERT(Surface_isSideMiddle(*this) || Surface_isSectorExtraPlane(*this)); // sanity check + DE_ASSERT(Surface_isSideMiddle(*this) || Surface_isSectorExtraPlane(*this)); // sanity check newOpacity = de::clamp(0.f, newOpacity, 1.f); if (!de::fequal(d->opacity, newOpacity)) { d->opacity = newOpacity; - DENG2_FOR_AUDIENCE2(OpacityChange, i) i->surfaceOpacityChanged(*this); + DE_FOR_AUDIENCE2(OpacityChange, i) i->surfaceOpacityChanged(*this); } return *this; } @@ -363,7 +363,7 @@ Surface &Surface::setColor(Vec3f const &newColor) if (d->color != newColorClamped) { d->color = newColorClamped; - DENG2_FOR_AUDIENCE2(ColorChange, i) i->surfaceColorChanged(*this); + DE_FOR_AUDIENCE2(ColorChange, i) i->surfaceColorChanged(*this); } return *this; } diff --git a/doomsday/apps/client/src/world/base/thinkers.cpp b/doomsday/apps/client/src/world/base/thinkers.cpp index 56c1202719..61162feb55 100644 --- a/doomsday/apps/client/src/world/base/thinkers.cpp +++ b/doomsday/apps/client/src/world/base/thinkers.cpp @@ -17,7 +17,7 @@ * http://www.gnu.org/licenses */ -#define DENG_NO_API_MACROS_THINKER +#define DE_NO_API_MACROS_THINKER #include "de_base.h" #include "world/thinkers.h" @@ -99,9 +99,9 @@ struct ThinkerList thinker_t *th = sentinel.next; while (th != &sentinel.base() && th) { -#ifdef LIBDENG_FAKE_MEMORY_ZONE - DENG2_ASSERT(th->next); - DENG2_ASSERT(th->prev); +#ifdef DE_FAKE_MEMORY_ZONE + DE_ASSERT(th->next); + DE_ASSERT(th->prev); #endif num += 1; if (numInStasis && Thinker_InStasis(th)) @@ -122,7 +122,7 @@ struct ThinkerList } }; -DENG2_PIMPL(Thinkers) +DE_PIMPL(Thinkers) { dint idtable[2048]; ///< 65536 bits telling which IDs are in use. dushort iddealer = 0; @@ -342,9 +342,9 @@ LoopResult Thinkers::forAll(dbyte flags, std::function thinker_t *th = list->sentinel.next; while (th != &list->sentinel.base() && th) { -#ifdef LIBDENG_FAKE_MEMORY_ZONE - DENG2_ASSERT(th->next); - DENG2_ASSERT(th->prev); +#ifdef DE_FAKE_MEMORY_ZONE + DE_ASSERT(th->next); + DE_ASSERT(th->prev); #endif thinker_t *next = th->next; @@ -374,9 +374,9 @@ LoopResult Thinkers::forAll(thinkfunc_t thinkFunc, dbyte flags, std::functionsentinel.next; while (th != &list->sentinel.base() && th) { -#ifdef LIBDENG_FAKE_MEMORY_ZONE - DENG2_ASSERT(th->next); - DENG2_ASSERT(th->prev); +#ifdef DE_FAKE_MEMORY_ZONE + DE_ASSERT(th->next); + DE_ASSERT(th->prev); #endif thinker_t *next = th->next; @@ -394,9 +394,9 @@ LoopResult Thinkers::forAll(thinkfunc_t thinkFunc, dbyte flags, std::functionsentinel.next; while (th != &list->sentinel.base() && th) { -#ifdef LIBDENG_FAKE_MEMORY_ZONE - DENG2_ASSERT(th->next); - DENG2_ASSERT(th->prev); +#ifdef DE_FAKE_MEMORY_ZONE + DE_ASSERT(th->next); + DE_ASSERT(th->prev); #endif thinker_t *next = th->next; @@ -436,7 +436,7 @@ using namespace world; void Thinker_InitPrivateData(thinker_t *th, Id::Type knownId) { - //DENG2_ASSERT(th->d == nullptr); + //DE_ASSERT(th->d == nullptr); /// @todo The game should be asked to create its own private data. -jk @@ -464,7 +464,7 @@ void Thinker_InitPrivateData(thinker_t *th, Id::Type knownId) } else { - DENG2_ASSERT(knownId != 0); + DE_ASSERT(knownId != 0); // Change the private identifier of the existing thinker data. THINKER_DATA(*th, ThinkerData).setId(knownId); @@ -475,7 +475,7 @@ void Thinker_InitPrivateData(thinker_t *th, Id::Type knownId) * Locates a mobj by it's unique identifier in the CURRENT map. */ #undef Mobj_ById -DENG_EXTERN_C struct mobj_s *Mobj_ById(dint id) +DE_EXTERN_C struct mobj_s *Mobj_ById(dint id) { /// @todo fixme: Do not assume the current map. if (!App_World().hasMap()) return nullptr; @@ -563,7 +563,7 @@ dint Thinker_Iterate(thinkfunc_t func, dint (*callback) (thinker_t *, void *), v }); } -DENG_DECLARE_API(Thinker) = +DE_DECLARE_API(Thinker) = { { DE_API_THINKER }, Thinker_Init, diff --git a/doomsday/apps/client/src/world/base/vertex.cpp b/doomsday/apps/client/src/world/base/vertex.cpp index b85ca47ba5..6944cf3a02 100644 --- a/doomsday/apps/client/src/world/base/vertex.cpp +++ b/doomsday/apps/client/src/world/base/vertex.cpp @@ -48,7 +48,7 @@ void Vertex::setOrigin(Vec2d const &newOrigin) if(_origin != newOrigin) { _origin = newOrigin; - DENG2_FOR_AUDIENCE(OriginChange, i) + DE_FOR_AUDIENCE(OriginChange, i) { i->vertexOriginChanged(*this); } diff --git a/doomsday/apps/client/src/world/bsp/convexsubspaceproxy.cpp b/doomsday/apps/client/src/world/bsp/convexsubspaceproxy.cpp index a1e0a07891..829100d0a0 100644 --- a/doomsday/apps/client/src/world/bsp/convexsubspaceproxy.cpp +++ b/doomsday/apps/client/src/world/bsp/convexsubspaceproxy.cpp @@ -94,7 +94,7 @@ struct Continuity */ void addOneSegment(OrderedSegment const &oseg) { - DENG2_ASSERT(oseg.segment->sectorPtr() == sector); + DE_ASSERT(oseg.segment->sectorPtr() == sector); // Separate the discordant duplicates. OrderedSegmentList *list = &orderedSegs; @@ -153,7 +153,7 @@ struct Continuity } } -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG void debugPrint() const { LOGDEV_MAP_MSG("Continuity %p (sector:%i, coverage:%f, discord:%i)") @@ -174,7 +174,7 @@ struct Continuity #endif }; -DENG2_PIMPL_NOREF(ConvexSubspaceProxy) +DE_PIMPL_NOREF(ConvexSubspaceProxy) { typedef QSet Segments; @@ -330,7 +330,7 @@ void ConvexSubspaceProxy::addSegments(QList const &newSegment d->needRebuildOrderedSegments = true; } -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG int numSegmentsAdded = d->segments.size() - sizeBefore; if(numSegmentsAdded < newSegments.size()) { @@ -431,7 +431,7 @@ void ConvexSubspaceProxy::buildGeometry(BspLeaf &leaf, Mesh &mesh) const seg->setLineSideOffset(Vec2d(mapSide->from().origin() - lineSeg->from().origin()).length()); seg->setLength(Vec2d(lineSeg->to().origin() - lineSeg->from().origin()).length()); #else - DENG2_UNUSED(seg); + DE_UNUSED(seg); #endif // Link the new half-edge for this line segment to the head of @@ -491,7 +491,7 @@ void ConvexSubspaceProxy::buildGeometry(BspLeaf &leaf, Mesh &mesh) const qSort(continuities.begin(), continuities.end()); leaf.setSector(continuities.first().sector); -/*#ifdef DENG_DEBUG +/*#ifdef DE_DEBUG LOG_INFO("ConvexSubspace %s BSP sector:%i (%i continuities)") << d->findCenter().asText() << (leaf.sectorPtr()? leaf.sectorPtr()->indexInArchive() : -1) @@ -527,7 +527,7 @@ void ConvexSubspaceProxy::buildGeometry(BspLeaf &leaf, Mesh &mesh) const seg->setLineSideOffset(Vec2d(mapSide->from().origin() - lineSeg->from().origin()).length()); seg->setLength(Vec2d(lineSeg->to().origin() - lineSeg->from().origin()).length()); #else - DENG2_UNUSED(seg); + DE_UNUSED(seg); #endif } diff --git a/doomsday/apps/client/src/world/bsp/hplane.cpp b/doomsday/apps/client/src/world/bsp/hplane.cpp index 7f71bef069..38693aa0e6 100644 --- a/doomsday/apps/client/src/world/bsp/hplane.cpp +++ b/doomsday/apps/client/src/world/bsp/hplane.cpp @@ -54,7 +54,7 @@ HPlane::Intercept::Intercept(ddouble distance, LineSegmentSide &lineSeg, dint ed LineSegmentSide &HPlane::Intercept::lineSegment() const { - DENG2_ASSERT(_lineSeg); + DE_ASSERT(_lineSeg); return *_lineSeg; } @@ -83,7 +83,7 @@ LineSegmentSide *HPlane::Intercept::afterLineSegment() const return _after; } -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG void HPlane::Intercept::debugPrint() const { LOGDEV_MAP_MSG("Vertex #%i %s beforeSector: #%d afterSector: #%d %s") @@ -94,7 +94,7 @@ void HPlane::Intercept::debugPrint() const } #endif -DENG2_PIMPL(HPlane) +DE_PIMPL(HPlane) { Partition partition; ///< The partition line. ddouble length; ///< Direction vector length. @@ -183,7 +183,7 @@ void HPlane::clearIntercepts() void HPlane::configure(LineSegmentSide const &newBaseSeg) { // Only map line segments are suitable. - DENG2_ASSERT(newBaseSeg.hasMapSide()); + DE_ASSERT(newBaseSeg.hasMapSide()); LOG_AS("HPlane::configure"); @@ -398,7 +398,7 @@ HPlane::Intercepts const &HPlane::intercepts() const return d->intercepts; } -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG void HPlane::printIntercepts() const { uint index = 0; diff --git a/doomsday/apps/client/src/world/bsp/linesegment.cpp b/doomsday/apps/client/src/world/bsp/linesegment.cpp index ada945bc50..04a24aed50 100644 --- a/doomsday/apps/client/src/world/bsp/linesegment.cpp +++ b/doomsday/apps/client/src/world/bsp/linesegment.cpp @@ -37,7 +37,7 @@ using namespace de; namespace world { namespace bsp { -DENG2_PIMPL_NOREF(LineSegment::Side) +DE_PIMPL_NOREF(LineSegment::Side) { /// Owning line segment. LineSegment *line = nullptr; @@ -92,7 +92,7 @@ void LineSegment::Side::updateCache() { d->direction = to().origin() - from().origin(); d->pLength = d->direction.length(); - DENG2_ASSERT(d->pLength > 0); + DE_ASSERT(d->pLength > 0); d->pAngle = M_DirectionToAngleXY(d->direction.x, d->direction.y); d->pSlopeType = M_SlopeTypeXY(d->direction.x, d->direction.y); d->pPerp = from().origin().y * d->direction.x - from().origin().x * d->direction.y; @@ -328,8 +328,8 @@ int LineSegment::Side::boxOnSide(AABoxd const &box) const LINESEGMENT_INCIDENT_DISTANCE_EPSILON); } -DENG2_PIMPL(LineSegment) -, DENG2_OBSERVES(Vertex, OriginChange) +DE_PIMPL(LineSegment) +, DE_OBSERVES(Vertex, OriginChange) { /// Vertexes of the line segment (not owned). Vertex *from; @@ -399,7 +399,7 @@ LineSegment::Side const &LineSegment::side(int back) const Vertex &LineSegment::vertex(int to) const { - DENG2_ASSERT((to? d->to : d->from) != nullptr); + DE_ASSERT((to? d->to : d->from) != nullptr); return to? *d->to : *d->from; } diff --git a/doomsday/apps/client/src/world/bsp/partitioner.cpp b/doomsday/apps/client/src/world/bsp/partitioner.cpp index ff91c05037..b0cca0d99b 100644 --- a/doomsday/apps/client/src/world/bsp/partitioner.cpp +++ b/doomsday/apps/client/src/world/bsp/partitioner.cpp @@ -56,7 +56,7 @@ typedef QList LineSegmentSides; typedef QList SubspaceProxys; typedef QHash EdgeTipSetMap; -DENG2_PIMPL(Partitioner) +DE_PIMPL(Partitioner) { int splitCostFactor = 7; ///< Cost of splitting a line segment. @@ -307,7 +307,7 @@ DENG2_PIMPL(Partitioner) LineSegmentSide &splitLineSegment(LineSegmentSide &frontLeft, Vec2d const &point, bool updateEdgeTips = true) { - DENG2_ASSERT(point != frontLeft.from().origin() && + DE_ASSERT(point != frontLeft.from().origin() && point != frontLeft.to().origin()); //LOG_DEBUG("Splitting line segment %p at %s") @@ -512,8 +512,8 @@ DENG2_PIMPL(Partitioner) * during the partitioning process. */ int const totalSegs = node.userData()->totalCount(); - DENG2_ASSERT(totalSegs != 0); - DENG2_UNUSED(totalSegs); + DE_ASSERT(totalSegs != 0); + DE_UNUSED(totalSegs); // Iterative pre-order traversal of SuperBlock. LineSegmentBlockTreeNode *cur = &node; @@ -562,9 +562,9 @@ DENG2_PIMPL(Partitioner) } // Sanity checks... - DENG2_ASSERT(rights.userData()->totalCount()); - DENG2_ASSERT(lefts.userData ()->totalCount()); - DENG2_ASSERT(( rights.userData()->totalCount() + DE_ASSERT(rights.userData()->totalCount()); + DE_ASSERT(lefts.userData ()->totalCount()); + DE_ASSERT(( rights.userData()->totalCount() + lefts.userData ()->totalCount()) >= totalSegs); } @@ -669,7 +669,7 @@ DENG2_PIMPL(Partitioner) } } - DENG2_ASSERT(sector); + DE_ASSERT(sector); LineSegment &newSeg = *makeLineSegment(fromVertex, toVertex, sector, sector, nullptr /*no map line*/, @@ -698,7 +698,7 @@ DENG2_PIMPL(Partitioner) { LineSegmentSides allSegs; -#ifdef DENG2_QT_4_7_OR_NEWER +#ifdef DE_QT_4_7_OR_NEWER allSegs.reserve(node.userData()->totalCount()); #endif @@ -1057,7 +1057,7 @@ DENG2_PIMPL(Partitioner) if(seg->hasHEdge() && !seg->back().hasHEdge()) { HEdge *hedge = &seg->hedge(); - DENG2_ASSERT(!hedge->hasTwin()); + DE_ASSERT(!hedge->hasTwin()); // Allocate the twin from the same mesh. hedge->setTwin(hedge->mesh().newHEdge(seg->back().from())); @@ -1074,13 +1074,13 @@ DENG2_PIMPL(Partitioner) */ void notifyUnclosedSectorFound(Sector §or, Vec2d const &nearPoint) { - DENG2_FOR_PUBLIC_AUDIENCE(UnclosedSectorFound, i) + DE_FOR_PUBLIC_AUDIENCE(UnclosedSectorFound, i) { i->unclosedSectorFound(sector, nearPoint); } } -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG void printSegments(LineSegmentSides const &allSegs) { for(LineSegmentSide const *seg : allSegs) diff --git a/doomsday/apps/client/src/world/bsp/partitionevaluator.cpp b/doomsday/apps/client/src/world/bsp/partitionevaluator.cpp index c35ac2733a..0ad656bf1c 100644 --- a/doomsday/apps/client/src/world/bsp/partitionevaluator.cpp +++ b/doomsday/apps/client/src/world/bsp/partitionevaluator.cpp @@ -173,7 +173,7 @@ namespace internal using namespace internal; -DENG2_PIMPL_NOREF(PartitionEvaluator) +DE_PIMPL_NOREF(PartitionEvaluator) { int splitCostFactor = 7; @@ -192,7 +192,7 @@ DENG2_PIMPL_NOREF(PartitionEvaluator) PartitionCandidate *nextCandidate() { - DENG2_ASSERT(costTaskPool.isDone()); + DE_ASSERT(costTaskPool.isDone()); if(candidates.isEmpty()) return nullptr; return candidates.takeFirst(); } @@ -385,7 +385,7 @@ DENG2_PIMPL_NOREF(PartitionEvaluator) */ void beginPartitionCosting(LineSegmentSide *line) { - DENG2_ASSERT(line && line->hasMapSide()); + DE_ASSERT(line && line->hasMapSide()); // Run a new partition cost task. PartitionCandidate *newCandidate = new PartitionCandidate(*line); candidates << newCandidate; diff --git a/doomsday/apps/client/src/world/bsp/superblockmap.cpp b/doomsday/apps/client/src/world/bsp/superblockmap.cpp index ba60d677e3..e51e574cd8 100644 --- a/doomsday/apps/client/src/world/bsp/superblockmap.cpp +++ b/doomsday/apps/client/src/world/bsp/superblockmap.cpp @@ -29,7 +29,7 @@ using namespace de; namespace world { namespace bsp { -DENG2_PIMPL_NOREF(LineSegmentBlock) +DE_PIMPL_NOREF(LineSegmentBlock) { AABox bounds; ///< Block bounds at the node. All segments; ///< Line segments contained by the node (not owned). diff --git a/doomsday/apps/client/src/world/clientmobjthinkerdata.cpp b/doomsday/apps/client/src/world/clientmobjthinkerdata.cpp index 4619017bae..461e3f25d7 100644 --- a/doomsday/apps/client/src/world/clientmobjthinkerdata.cpp +++ b/doomsday/apps/client/src/world/clientmobjthinkerdata.cpp @@ -46,8 +46,8 @@ namespace internal using namespace ::internal; -DENG2_PIMPL(ClientMobjThinkerData) -, DENG2_OBSERVES(Asset, Deletion) +DE_PIMPL(ClientMobjThinkerData) +, DE_OBSERVES(Asset, Deletion) { enum SerialFlagUInt16 { diff --git a/doomsday/apps/client/src/world/contact.cpp b/doomsday/apps/client/src/world/contact.cpp index a2f9eb8cb0..2855e3c812 100644 --- a/doomsday/apps/client/src/world/contact.cpp +++ b/doomsday/apps/client/src/world/contact.cpp @@ -50,7 +50,7 @@ Vec3d Contact::objectOrigin() const default: break; } - DENG2_ASSERT(false); + DE_ASSERT(false); return Vec3d(); } @@ -63,7 +63,7 @@ ddouble Contact::objectRadius() const default: break; } - DENG2_ASSERT(false); + DE_ASSERT(false); return 0; } @@ -76,7 +76,7 @@ AABoxd Contact::objectBounds() const default: break; } - DENG2_ASSERT(false); + DE_ASSERT(false); return AABoxd(); } @@ -128,7 +128,7 @@ ContactList::Node *ContactList::begin() const ContactList::Node *ContactList::newNode(void *object) // static { - DENG2_ASSERT(object); + DE_ASSERT(object); Node *node; if(!cursor) @@ -164,7 +164,7 @@ static Contact *contactFirst, *contactCursor; static Contact *newContact(void *object, ContactType type) { - DENG2_ASSERT(object); + DE_ASSERT(object); Contact *contact; if(!contactCursor) diff --git a/doomsday/apps/client/src/world/contactspreader.cpp b/doomsday/apps/client/src/world/contactspreader.cpp index fbef935d57..6651873221 100644 --- a/doomsday/apps/client/src/world/contactspreader.cpp +++ b/doomsday/apps/client/src/world/contactspreader.cpp @@ -137,7 +137,7 @@ struct ContactSpreader void maybeSpreadOverEdge(HEdge *hedge) { - DENG2_ASSERT(_spread.contact != 0); + DE_ASSERT(_spread.contact != 0); if (!hedge) return; diff --git a/doomsday/apps/client/src/world/generator.cpp b/doomsday/apps/client/src/world/generator.cpp index 1b15e4a764..274dedc849 100644 --- a/doomsday/apps/client/src/world/generator.cpp +++ b/doomsday/apps/client/src/world/generator.cpp @@ -110,7 +110,7 @@ Generator::Id Generator::id() const void Generator::setId(Id newId) { - DENG2_ASSERT(newId >= 1 && newId <= Map::MAX_GENERATORS); // 1-based + DE_ASSERT(newId >= 1 && newId <= Map::MAX_GENERATORS); // 1-based _id = newId; } @@ -139,7 +139,7 @@ void Generator::clearParticles() void Generator::configureFromDef(ded_ptcgen_t const *newDef) { - DENG2_ASSERT(newDef); + DE_ASSERT(newDef); if(count <= 0) count = 1; @@ -243,7 +243,7 @@ ParticleInfo const *Generator::particleInfo() const static void setParticleAngles(ParticleInfo *pinfo, dint flags) { - DENG2_ASSERT(pinfo); + DE_ASSERT(pinfo); if(flags & Generator::ParticleStage::ZeroYaw) pinfo->yaw = 0; @@ -257,7 +257,7 @@ static void setParticleAngles(ParticleInfo *pinfo, dint flags) static void particleSound(fixed_t pos[3], ded_embsound_t *sound) { - DENG2_ASSERT(pos && sound); + DE_ASSERT(pos && sound); // Is there any sound to play? if(!sound->id || sound->volume <= 0) return; @@ -625,7 +625,7 @@ void Generator::spinParticle(ParticleInfo &pinfo) ded_ptcstage_t const *stDef = &def->stages[pinfo.stage]; duint const spinIndex = uint(&pinfo - &_pinfo[id() / 8]) % 4; - DENG2_ASSERT(spinIndex < 4); + DE_ASSERT(spinIndex < 4); dint const yawSign = yawSigns[spinIndex]; dint const pitchSign = pitchSigns[spinIndex]; @@ -645,7 +645,7 @@ void Generator::spinParticle(ParticleInfo &pinfo) void Generator::moveParticle(dint index) { - DENG2_ASSERT(index >= 0 && index < count); + DE_ASSERT(index >= 0 && index < count); ParticleInfo *pinfo = &_pinfo[index]; ParticleStage *st = &stages[pinfo->stage]; @@ -897,7 +897,7 @@ void Generator::moveParticle(dint index) // Iterate the lines in the contacted blocks. validCount++; - DENG2_ASSERT(!clParm.ptcHitLine); + DE_ASSERT(!clParm.ptcHitLine); map().forAllLinesInBox(clParm.box, [&clParm] (Line &line) { // Does the bounding box miss the line completely? @@ -1031,7 +1031,7 @@ void Generator::runTick() } // Time to die? - DENG2_ASSERT(def); + DE_ASSERT(def); if(++_age > def->maxAge && def->maxAge >= 0) { Generator_Delete(this); @@ -1139,7 +1139,7 @@ void Generator_Delete(Generator *gen) void Generator_Thinker(Generator *gen) { - DENG2_ASSERT(gen != 0); + DE_ASSERT(gen != 0); gen->runTick(); } diff --git a/doomsday/apps/client/src/world/mapobject.cpp b/doomsday/apps/client/src/world/mapobject.cpp index 3786f95376..3704fe715e 100644 --- a/doomsday/apps/client/src/world/mapobject.cpp +++ b/doomsday/apps/client/src/world/mapobject.cpp @@ -26,7 +26,7 @@ using namespace de; namespace world { -DENG2_PIMPL_NOREF(MapObject) +DE_PIMPL_NOREF(MapObject) { Map *map = nullptr; dint indexInMap = NoIndex; diff --git a/doomsday/apps/gloom/CMakeLists.txt b/doomsday/apps/gloom/CMakeLists.txt index a64b1df80b..fdd7f54103 100644 --- a/doomsday/apps/gloom/CMakeLists.txt +++ b/doomsday/apps/gloom/CMakeLists.txt @@ -1,15 +1,15 @@ cmake_minimum_required (VERSION 3.1) project (GLOOM) -# set (DENG_OPENGL_API 3.3) +# set (DE_OPENGL_API 3.3) # set (CMAKE_AUTOMOC ON) # set (CMAKE_AUTORCC ON) -# set (DENG_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/../..) -# set (DENG_INSTALL_LIB_DIR lib) +# set (DE_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/../..) +# set (DE_INSTALL_LIB_DIR lib) # if (WIN32) -# set (DENG_INSTALL_DATA_DIR data) +# set (DE_INSTALL_DATA_DIR data) # else () -# set (DENG_INSTALL_DATA_DIR share/doomsday) +# set (DE_INSTALL_DATA_DIR share/doomsday) # endif () # Note: Additionally CMAKE_INSTALL_PREFIX must point to the SDK install dir. @@ -107,8 +107,8 @@ set (SOURCES src/mainwindow.cpp src/mainwindow.h # Polygon clipper - #${DENG_EXTERNAL_SOURCE_DIR}/gpc/gpc.c - #${DENG_EXTERNAL_SOURCE_DIR}/gpc/gpc.h + #${DE_EXTERNAL_SOURCE_DIR}/gpc/gpc.c + #${DE_EXTERNAL_SOURCE_DIR}/gpc/gpc.h ) # Deploy the FMOD library. @@ -122,13 +122,13 @@ endif () deng_add_application (gloom ${SOURCES} ${HEADERS}) -target_include_directories (gloom PRIVATE ${CMAKE_CURRENT_LIST_DIR} ${DENG_EXTERNAL_SOURCE_DIR}/gpc) +target_include_directories (gloom PRIVATE ${CMAKE_CURRENT_LIST_DIR} ${DE_EXTERNAL_SOURCE_DIR}/gpc) target_link_libraries (gloom Deng::libappfw Deng::libdoomsday fmodex) if (APPLE) set_target_properties (gloom PROPERTIES OUTPUT_NAME gloom - MACOSX_BUNDLE_INFO_PLIST ${DENG_SOURCE_DIR}/cmake/MacOSXBundleInfo.plist.in + MACOSX_BUNDLE_INFO_PLIST ${DE_SOURCE_DIR}/cmake/MacOSXBundleInfo.plist.in ) deng_install_bundle_deps (gloom Deng::libcore Deng::libgui Deng::libappfw Deng::libshell Deng::liblegacy Deng::libdoomsday diff --git a/doomsday/apps/gloom/gloom/audio/audiosystem.cpp b/doomsday/apps/gloom/gloom/audio/audiosystem.cpp index 933152b4d9..993216a771 100644 --- a/doomsday/apps/gloom/gloom/audio/audiosystem.cpp +++ b/doomsday/apps/gloom/gloom/audio/audiosystem.cpp @@ -86,7 +86,7 @@ struct FileAdapter static AudioSystem *theAudioSystem = {nullptr}; -DENG2_PIMPL(AudioSystem) +DE_PIMPL(AudioSystem) { struct AudibleSound; @@ -164,7 +164,7 @@ DENG2_PIMPL(AudioSystem) else { // Instruct FMOD to load it from the source file. - DENG2_ASSERT(wf.sourceFile() != 0); + DE_ASSERT(wf.sourceFile() != 0); info.fileuseropen = FileAdapter::open; info.fileuserclose = FileAdapter::close; @@ -254,14 +254,14 @@ DENG2_PIMPL(AudioSystem) stop(); - DENG2_FOR_AUDIENCE2(Deletion, i) i->soundBeingDeleted(*this); + DE_FOR_AUDIENCE2(Deletion, i) i->soundBeingDeleted(*this); cached.sounds.remove(this); } /// Start the sound on a new channel but leave it paused. void alloc() { - DENG2_ASSERT(!channel); + DE_ASSERT(!channel); int flags = 0; if (_mode == Looping) flags |= CachedWaveform::Loop; @@ -303,7 +303,7 @@ DENG2_PIMPL(AudioSystem) void notifyStop() { - DENG2_FOR_AUDIENCE2(Stop, i) i->soundStopped(*this); + DE_FOR_AUDIENCE2(Stop, i) i->soundStopped(*this); } void play(PlayingMode playMode) @@ -315,7 +315,7 @@ DENG2_PIMPL(AudioSystem) update(); channel->setPaused(false); - DENG2_FOR_AUDIENCE2(Play, i) { i->soundPlayed(*this); } + DE_FOR_AUDIENCE2(Play, i) { i->soundPlayed(*this); } } void stop() @@ -481,7 +481,7 @@ DENG2_PIMPL(AudioSystem) Sound &load(Waveform const &waveform) { - DENG2_ASSERT(system != 0); + DE_ASSERT(system != 0); Cache::iterator found = cache.find(&waveform); CachedWaveform *cached = 0; @@ -515,7 +515,7 @@ Sound &AudioSystem::newSound(Waveform const &waveform) Sound &AudioSystem::newSound(DotPath const &appWaveform) { Sound &sound = newSound(GloomApp::waveforms().waveform(appWaveform)); - DENG2_FOR_AUDIENCE(NewSound, i) + DE_FOR_AUDIENCE(NewSound, i) { i->newSoundCreated(sound, appWaveform); } diff --git a/doomsday/apps/gloom/gloom/audio/audiosystem.h b/doomsday/apps/gloom/gloom/audio/audiosystem.h index 44fefe323c..181756b1d9 100644 --- a/doomsday/apps/gloom/gloom/audio/audiosystem.h +++ b/doomsday/apps/gloom/gloom/audio/audiosystem.h @@ -16,7 +16,7 @@ class AudioSystem : public de::System /** * Native audio interface could not be accessed. @ingroup errors */ - DENG2_ERROR(NativeError); + DE_ERROR(NativeError); public: AudioSystem(); @@ -50,10 +50,10 @@ class AudioSystem : public de::System const ICamera *listener() const; public: - DENG2_DEFINE_AUDIENCE(NewSound, void newSoundCreated(de::Sound &, de::DotPath const &name)) + DE_DEFINE_AUDIENCE(NewSound, void newSoundCreated(de::Sound &, de::DotPath const &name)) private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/geo/polygon.cpp b/doomsday/apps/gloom/gloom/geo/polygon.cpp index 455aefd7e7..99e5c69bb5 100644 --- a/doomsday/apps/gloom/gloom/geo/polygon.cpp +++ b/doomsday/apps/gloom/gloom/geo/polygon.cpp @@ -40,8 +40,8 @@ void Polygon::updateBounds() for (int i = 1; i < size(); ++i) { // Polygon points must be unique. - DENG2_ASSERT(points[i].id != points[i - 1].id); - DENG2_ASSERT(points[i].pos != points[i - 1].pos); + DE_ASSERT(points[i].id != points[i - 1].id); + DE_ASSERT(points[i].pos != points[i - 1].pos); bounds.include(points[i].pos); } @@ -241,7 +241,7 @@ bool Polygon::isPointInside(const Vec2d &point) const { if (points.size() < 3) return false; - DENG2_ASSERT(!bounds.isNull()); + DE_ASSERT(!bounds.isNull()); if (bounds.contains(point)) { @@ -526,7 +526,7 @@ QList Polygon::splitConvexParts() const for (const int j : insets) { - DENG2_ASSERT(poly.size() >= 4); + DE_ASSERT(poly.size() >= 4); // qDebug(" trying with %i", j); for (int k = mod(j + 2, poly.size()); k != j; k = mod(k + 1, poly.size())) @@ -593,7 +593,7 @@ QList Polygon::splitConvexParts() const { qDebug("have %i insets, couldn't find a split", insets.size()); qDebug() << poly.asText(); - DENG2_ASSERT(!availableSplits.isEmpty()); + DE_ASSERT(!availableSplits.isEmpty()); } else { @@ -622,7 +622,7 @@ QList Polygon::splitConvexParts() const // parts.size()); // } - DENG2_ASSERT(areAllConvex(parts)); + DE_ASSERT(areAllConvex(parts)); return parts; } diff --git a/doomsday/apps/gloom/gloom/gloomwidget.cpp b/doomsday/apps/gloom/gloom/gloomwidget.cpp index 073e452cd8..83c02d1190 100644 --- a/doomsday/apps/gloom/gloom/gloomwidget.cpp +++ b/doomsday/apps/gloom/gloom/gloomwidget.cpp @@ -32,7 +32,7 @@ using namespace de; namespace gloom { -DENG_GUI_PIMPL(GloomWidget) +DE_GUI_PIMPL(GloomWidget) { Mat4f modelView; SafePtr world; @@ -110,7 +110,7 @@ void GloomWidget::setWorld(World *world) } d->world = world; - DENG2_FOR_AUDIENCE(Change, i) { i->currentWorldChanged(oldWorld, world); } + DE_FOR_AUDIENCE(Change, i) { i->currentWorldChanged(oldWorld, world); } if (d->world) { diff --git a/doomsday/apps/gloom/gloom/gloomwidget.h b/doomsday/apps/gloom/gloom/gloomwidget.h index fcad712d09..8f6bf74648 100644 --- a/doomsday/apps/gloom/gloom/gloomwidget.h +++ b/doomsday/apps/gloom/gloom/gloomwidget.h @@ -54,7 +54,7 @@ class GloomWidget de::Mat4f cameraModelView() const; de::Mat4f cameraProjection() const; - DENG2_DEFINE_AUDIENCE(Change, void currentWorldChanged(const World *old, World *current)) + DE_DEFINE_AUDIENCE(Change, void currentWorldChanged(const World *old, World *current)) public slots: void setWorld(World *world); @@ -64,7 +64,7 @@ public slots: void glDeinit(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/gloomworld.cpp b/doomsday/apps/gloom/gloom/gloomworld.cpp index 14ddc0bf25..3323592925 100644 --- a/doomsday/apps/gloom/gloom/gloomworld.cpp +++ b/doomsday/apps/gloom/gloom/gloomworld.cpp @@ -72,8 +72,8 @@ enum { PerfTimerCount }; -DENG2_PIMPL(GloomWorld), public Asset -, DENG2_OBSERVES(User, Warp) +DE_PIMPL(GloomWorld), public Asset +, DE_OBSERVES(User, Warp) { User * localUser = nullptr; Context renderContext; @@ -140,7 +140,7 @@ DENG2_PIMPL(GloomWorld), public Asset qDebug() << "[GloomWorld] glInit"; - DENG2_ASSERT(localUser); + DE_ASSERT(localUser); // Cube maps are used for 360-degree env maps, so prefer seamless edge filtering. LIBGUI_GL.glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS); @@ -247,7 +247,7 @@ void GloomWorld::glInit() { if (d->glInit()) { - DENG2_FOR_AUDIENCE(Ready, i) + DE_FOR_AUDIENCE(Ready, i) { i->worldReady(*this); } diff --git a/doomsday/apps/gloom/gloom/gloomworld.h b/doomsday/apps/gloom/gloom/gloomworld.h index 6e53cc8e5d..add17897b3 100644 --- a/doomsday/apps/gloom/gloom/gloomworld.h +++ b/doomsday/apps/gloom/gloom/gloomworld.h @@ -64,7 +64,7 @@ class GloomWorld : public World double ceilingHeight(const Vec3d &posMeters) const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/render/bloom.cpp b/doomsday/apps/gloom/gloom/render/bloom.cpp index 64b3af729e..7fbd802f5f 100644 --- a/doomsday/apps/gloom/gloom/render/bloom.cpp +++ b/doomsday/apps/gloom/gloom/render/bloom.cpp @@ -27,7 +27,7 @@ using namespace de; namespace gloom { -DENG2_PIMPL(Bloom) +DE_PIMPL(Bloom) { ScreenQuad quad; struct WorkBuf { diff --git a/doomsday/apps/gloom/gloom/render/bloom.h b/doomsday/apps/gloom/gloom/render/bloom.h index dcaf5bf977..c566fc3401 100644 --- a/doomsday/apps/gloom/gloom/render/bloom.h +++ b/doomsday/apps/gloom/gloom/render/bloom.h @@ -35,7 +35,7 @@ class Bloom : public Render de::GLUniform &uBloomFramebuf(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/render/entityrender.cpp b/doomsday/apps/gloom/gloom/render/entityrender.cpp index 5e8b600d6e..eff850c6a2 100644 --- a/doomsday/apps/gloom/gloom/render/entityrender.cpp +++ b/doomsday/apps/gloom/gloom/render/entityrender.cpp @@ -43,7 +43,7 @@ internal::AttribSpec const InstanceData::_spec[2] = { }; LIBGUI_VERTEX_FORMAT_SPEC(InstanceData, 20 * sizeof(float)) -DENG2_PIMPL(EntityRender) +DE_PIMPL(EntityRender) { EntityMap ents; ModelDrawable entityModels[5]; @@ -123,7 +123,7 @@ DENG2_PIMPL(EntityRender) void create() { - DENG2_ASSERT(self().context().map); + DE_ASSERT(self().context().map); const auto &map = *self().context().map; diff --git a/doomsday/apps/gloom/gloom/render/entityrender.h b/doomsday/apps/gloom/gloom/render/entityrender.h index 9131f8b199..bd413b57e9 100644 --- a/doomsday/apps/gloom/gloom/render/entityrender.h +++ b/doomsday/apps/gloom/gloom/render/entityrender.h @@ -40,7 +40,7 @@ class EntityRender : public Render void renderShadows(const Light &); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/render/gbuffer.cpp b/doomsday/apps/gloom/gloom/render/gbuffer.cpp index 02923671cb..17a2c87ada 100644 --- a/doomsday/apps/gloom/gloom/render/gbuffer.cpp +++ b/doomsday/apps/gloom/gloom/render/gbuffer.cpp @@ -31,7 +31,7 @@ using namespace de; namespace gloom { -DENG2_PIMPL(GBuffer) +DE_PIMPL(GBuffer) { GLTextureFramebuffer frame{GLTextureFramebuffer::Formats({Image::RGB_888, // diffuse Image::RGB_32f, // normals (viewspace) diff --git a/doomsday/apps/gloom/gloom/render/gbuffer.h b/doomsday/apps/gloom/gloom/render/gbuffer.h index d69ca1e2e6..7633c22804 100644 --- a/doomsday/apps/gloom/gloom/render/gbuffer.h +++ b/doomsday/apps/gloom/gloom/render/gbuffer.h @@ -54,7 +54,7 @@ class GBuffer : public Render GLUniform &uViewportSize(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/render/light.cpp b/doomsday/apps/gloom/gloom/render/light.cpp index 4726e2c171..c34cea0612 100644 --- a/doomsday/apps/gloom/gloom/render/light.cpp +++ b/doomsday/apps/gloom/gloom/render/light.cpp @@ -22,7 +22,7 @@ using namespace de; namespace gloom { -DENG2_PIMPL(Light) +DE_PIMPL(Light) { const Entity *entity = nullptr; Type type = Omni; diff --git a/doomsday/apps/gloom/gloom/render/light.h b/doomsday/apps/gloom/gloom/render/light.h index 4b975c0a0b..22e7a6d8ec 100644 --- a/doomsday/apps/gloom/gloom/render/light.h +++ b/doomsday/apps/gloom/gloom/render/light.h @@ -71,7 +71,7 @@ class Light : public ICamera Mat4f cameraModelView() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/render/lightrender.cpp b/doomsday/apps/gloom/gloom/render/lightrender.cpp index e5a2e2ebe0..d063a36e40 100644 --- a/doomsday/apps/gloom/gloom/render/lightrender.cpp +++ b/doomsday/apps/gloom/gloom/render/lightrender.cpp @@ -50,7 +50,7 @@ LIBGUI_VERTEX_FORMAT_SPEC(LightData, 11 * 4) static constexpr int MAX_OMNI_LIGHTS = 6; static constexpr int MAX_OMNI_SHADOWS = 6; -DENG2_PIMPL(LightRender) +DE_PIMPL(LightRender) { using VBuf = GLBufferT; using Lights = QHash>; @@ -367,7 +367,7 @@ void LightRender::render() // Update shadow maps. foreach (auto *light, d->shadowCasters) { - DENG2_ASSERT(light->castShadows()); + DE_ASSERT(light->castShadows()); { Shadow *shadow = nullptr; if (light->type() == Light::Directional) diff --git a/doomsday/apps/gloom/gloom/render/lightrender.h b/doomsday/apps/gloom/gloom/render/lightrender.h index c393060dae..942a767033 100644 --- a/doomsday/apps/gloom/gloom/render/lightrender.h +++ b/doomsday/apps/gloom/gloom/render/lightrender.h @@ -59,7 +59,7 @@ class LightRender : public Render const ICamera *testCamera() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/render/mapbuild.cpp b/doomsday/apps/gloom/gloom/render/mapbuild.cpp index dd494570d4..f251c628f7 100644 --- a/doomsday/apps/gloom/gloom/render/mapbuild.cpp +++ b/doomsday/apps/gloom/gloom/render/mapbuild.cpp @@ -42,7 +42,7 @@ internal::AttribSpec const MapVertex::_spec[10] = }; LIBGUI_VERTEX_FORMAT_SPEC(MapVertex, 23 * 4) -DENG2_PIMPL_NOREF(MapBuild) +DE_PIMPL_NOREF(MapBuild) { const Map & map; const MaterialLib &matLib; @@ -182,7 +182,7 @@ DENG2_PIMPL_NOREF(MapBuild) f.texCoord = Vec4f(0, 0, 0, 0); // fixed offset f.expander = expanders[pointID]; - DENG2_ASSERT(!pointIndices.contains(pointID)); + DE_ASSERT(!pointIndices.contains(pointID)); pointIndices.insert(pointID, Buffer::Index(verts[geomBuf].size())); verts[geomBuf] << f; @@ -197,9 +197,9 @@ DENG2_PIMPL_NOREF(MapBuild) { for (int j = 1; j < convex.size() - 1; ++j) { - DENG2_ASSERT(pointIndices.contains(baseID)); - DENG2_ASSERT(pointIndices.contains(convex.points[j + 1].id)); - DENG2_ASSERT(pointIndices.contains(convex.points[j].id)); + DE_ASSERT(pointIndices.contains(baseID)); + DE_ASSERT(pointIndices.contains(convex.points[j + 1].id)); + DE_ASSERT(pointIndices.contains(convex.points[j].id)); indices[geomBuf] << pointIndices[baseID] << pointIndices[convex.points[j + 1].id] @@ -210,9 +210,9 @@ DENG2_PIMPL_NOREF(MapBuild) { for (int j = 1; j < convex.size() - 1; ++j) { - DENG2_ASSERT(pointIndices.contains(baseID)); - DENG2_ASSERT(pointIndices.contains(convex.points[j + 1].id)); - DENG2_ASSERT(pointIndices.contains(convex.points[j].id)); + DE_ASSERT(pointIndices.contains(baseID)); + DE_ASSERT(pointIndices.contains(convex.points[j + 1].id)); + DE_ASSERT(pointIndices.contains(convex.points[j].id)); indices[geomBuf] << pointIndices[baseID] << pointIndices[convex.points[j].id] @@ -383,8 +383,8 @@ DENG2_PIMPL_NOREF(MapBuild) bufs.geom[i]->setIndices(gl::Triangles, indices[i], gl::Static); } - DENG2_ASSERT(indices[0].size() % 3 == 0); - DENG2_ASSERT(indices[1].size() % 3 == 0); + DE_ASSERT(indices[0].size() % 3 == 0); + DE_ASSERT(indices[1].size() % 3 == 0); LOG_MSG("Built %i vertices and %i indices for opaque geometry; %i vertices and %i indices " "for transparent geometry") diff --git a/doomsday/apps/gloom/gloom/render/mapbuild.h b/doomsday/apps/gloom/gloom/render/mapbuild.h index b767672c41..ba2903ab2d 100644 --- a/doomsday/apps/gloom/gloom/render/mapbuild.h +++ b/doomsday/apps/gloom/gloom/render/mapbuild.h @@ -105,7 +105,7 @@ class MapBuild const Mapper &texOffsetMapper() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/render/maprender.cpp b/doomsday/apps/gloom/gloom/render/maprender.cpp index 55c5b522e6..5b1792fd6e 100644 --- a/doomsday/apps/gloom/gloom/render/maprender.cpp +++ b/doomsday/apps/gloom/gloom/render/maprender.cpp @@ -35,7 +35,7 @@ using namespace de; namespace gloom { -DENG2_PIMPL(MapRender) +DE_PIMPL(MapRender) { MaterialLib matLib; MapBuild::Buffers builtMap; @@ -79,7 +79,7 @@ DENG2_PIMPL(MapRender) surfaces.clear(); - DENG2_ASSERT(map); + DE_ASSERT(map); MapBuild builder{*map, matLib}; builtMap = builder.build(); diff --git a/doomsday/apps/gloom/gloom/render/maprender.h b/doomsday/apps/gloom/gloom/render/maprender.h index e773041c1f..119cb5de56 100644 --- a/doomsday/apps/gloom/gloom/render/maprender.h +++ b/doomsday/apps/gloom/gloom/render/maprender.h @@ -48,7 +48,7 @@ class MapRender : public Render MaterialLib &materialLibrary(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/render/materiallib.cpp b/doomsday/apps/gloom/gloom/render/materiallib.cpp index 899d92c6e4..cb770597a3 100644 --- a/doomsday/apps/gloom/gloom/render/materiallib.cpp +++ b/doomsday/apps/gloom/gloom/render/materiallib.cpp @@ -31,8 +31,8 @@ using namespace de; namespace gloom { -DENG2_PIMPL(MaterialLib) -, DENG2_OBSERVES(filesys::AssetObserver, Availability) +DE_PIMPL(MaterialLib) +, DE_OBSERVES(filesys::AssetObserver, Availability) { struct Properties { MaterialFlags flags{Opaque}; @@ -249,7 +249,7 @@ DENG2_PIMPL(MaterialLib) // Load up metrics in an array. for (int j = 0; j < 4; ++j) { - DENG2_ASSERT(materials.contains(i.key())); + DE_ASSERT(materials.contains(i.key())); const auto &props = materials[i.key()]; const Id texId = i.value()[j]; diff --git a/doomsday/apps/gloom/gloom/render/materiallib.h b/doomsday/apps/gloom/gloom/render/materiallib.h index c8df230955..92b31c72a1 100644 --- a/doomsday/apps/gloom/gloom/render/materiallib.h +++ b/doomsday/apps/gloom/gloom/render/materiallib.h @@ -73,7 +73,7 @@ class MaterialLib : public Render GLUniform &uTextureMetrics(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; Q_DECLARE_OPERATORS_FOR_FLAGS(MaterialLib::MaterialFlags) diff --git a/doomsday/apps/gloom/gloom/render/render.cpp b/doomsday/apps/gloom/gloom/render/render.cpp index f16eba9483..1cc83f91d1 100644 --- a/doomsday/apps/gloom/gloom/render/render.cpp +++ b/doomsday/apps/gloom/gloom/render/render.cpp @@ -20,7 +20,7 @@ namespace gloom { -DENG2_PIMPL_NOREF(Render) +DE_PIMPL_NOREF(Render) { Context *context = nullptr; }; @@ -31,30 +31,30 @@ Render::Render() Render::~Render() { - DENG2_ASSERT(d->context == nullptr); + DE_ASSERT(d->context == nullptr); } const Context &Render::context() const { - DENG2_ASSERT(d->context); + DE_ASSERT(d->context); return *d->context; } Context &Render::context() { - DENG2_ASSERT(d->context); + DE_ASSERT(d->context); return *d->context; } void Render::glInit(Context &context) { - DENG2_ASSERT(d->context == nullptr); + DE_ASSERT(d->context == nullptr); d->context = &context; } void Render::glDeinit() { - DENG2_ASSERT(d->context != nullptr); + DE_ASSERT(d->context != nullptr); d->context = nullptr; } diff --git a/doomsday/apps/gloom/gloom/render/render.h b/doomsday/apps/gloom/gloom/render/render.h index c9f094f266..d9efed7d49 100644 --- a/doomsday/apps/gloom/gloom/render/render.h +++ b/doomsday/apps/gloom/gloom/render/render.h @@ -43,7 +43,7 @@ class Render virtual void render() = 0; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/render/screenquad.cpp b/doomsday/apps/gloom/gloom/render/screenquad.cpp index ec75a53709..8430a76f86 100644 --- a/doomsday/apps/gloom/gloom/render/screenquad.cpp +++ b/doomsday/apps/gloom/gloom/render/screenquad.cpp @@ -27,7 +27,7 @@ static const int BUF_ID = 1; using VBuf = GLBufferT; static std::shared_ptr s_vertexBuffer; // shared between all ScreenQuad instances -DENG2_PIMPL_NOREF(ScreenQuad) +DE_PIMPL_NOREF(ScreenQuad) { Drawable drawable; GLState state; diff --git a/doomsday/apps/gloom/gloom/render/screenquad.h b/doomsday/apps/gloom/gloom/render/screenquad.h index 2f00594335..c67d7267bc 100644 --- a/doomsday/apps/gloom/gloom/render/screenquad.h +++ b/doomsday/apps/gloom/gloom/render/screenquad.h @@ -41,7 +41,7 @@ class ScreenQuad : public Render de::GLState & state(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/render/shadow.cpp b/doomsday/apps/gloom/gloom/render/shadow.cpp index 8d809b7753..386ab76e98 100644 --- a/doomsday/apps/gloom/gloom/render/shadow.cpp +++ b/doomsday/apps/gloom/gloom/render/shadow.cpp @@ -25,7 +25,7 @@ using namespace de; namespace gloom { -DENG2_PIMPL_NOREF(Shadow) +DE_PIMPL_NOREF(Shadow) { Light::Type lightType; GLTexture map; diff --git a/doomsday/apps/gloom/gloom/render/shadow.h b/doomsday/apps/gloom/gloom/render/shadow.h index 26d2ca7d74..eda36c8843 100644 --- a/doomsday/apps/gloom/gloom/render/shadow.h +++ b/doomsday/apps/gloom/gloom/render/shadow.h @@ -38,7 +38,7 @@ class Shadow de::GLFramebuffer &framebuf(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/render/skybox.cpp b/doomsday/apps/gloom/gloom/render/skybox.cpp index a0740958ff..c52e3790e7 100644 --- a/doomsday/apps/gloom/gloom/render/skybox.cpp +++ b/doomsday/apps/gloom/gloom/render/skybox.cpp @@ -26,7 +26,7 @@ using namespace de; namespace gloom { -DENG2_PIMPL_NOREF(SkyBox) +DE_PIMPL_NOREF(SkyBox) { typedef GLBufferT VBuf; @@ -110,7 +110,7 @@ void SkyBox::render() { GLState::push().setDepthWrite(false); - DENG2_ASSERT(d->skyBox.program().isReady()); + DE_ASSERT(d->skyBox.program().isReady()); d->uSkyMvpMatrix = context().view.uCameraMvpMatrix.toMat4f() * Mat4f::translate(context().view.camera->cameraPosition()) * diff --git a/doomsday/apps/gloom/gloom/render/skybox.h b/doomsday/apps/gloom/gloom/render/skybox.h index ed9b0d7804..1c86d0f751 100644 --- a/doomsday/apps/gloom/gloom/render/skybox.h +++ b/doomsday/apps/gloom/gloom/render/skybox.h @@ -38,7 +38,7 @@ class SkyBox : public Render void render() override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/render/ssao.cpp b/doomsday/apps/gloom/gloom/render/ssao.cpp index 2f1be18bbc..4f12c397a6 100644 --- a/doomsday/apps/gloom/gloom/render/ssao.cpp +++ b/doomsday/apps/gloom/gloom/render/ssao.cpp @@ -29,7 +29,7 @@ namespace gloom { static const dsize SAMPLE_COUNT = 64; -DENG2_PIMPL(SSAO) +DE_PIMPL(SSAO) { enum { Noisy, Blurred }; diff --git a/doomsday/apps/gloom/gloom/render/ssao.h b/doomsday/apps/gloom/gloom/render/ssao.h index 3428c0b7e6..bb8b93596c 100644 --- a/doomsday/apps/gloom/gloom/render/ssao.h +++ b/doomsday/apps/gloom/gloom/render/ssao.h @@ -40,7 +40,7 @@ class SSAO : public Render de::GLUniform &uSSAOBuf(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/render/tonemap.cpp b/doomsday/apps/gloom/gloom/render/tonemap.cpp index 2faf411609..5d32ec44dc 100644 --- a/doomsday/apps/gloom/gloom/render/tonemap.cpp +++ b/doomsday/apps/gloom/gloom/render/tonemap.cpp @@ -28,7 +28,7 @@ using namespace de; namespace gloom { -DENG2_PIMPL(Tonemap) +DE_PIMPL(Tonemap) { ScreenQuad quad; GLUniform uFramebuf{"uFramebuf", GLUniform::Sampler2D}; diff --git a/doomsday/apps/gloom/gloom/render/tonemap.h b/doomsday/apps/gloom/gloom/render/tonemap.h index 3a438148fd..b3c3a5f864 100644 --- a/doomsday/apps/gloom/gloom/render/tonemap.h +++ b/doomsday/apps/gloom/gloom/render/tonemap.h @@ -39,7 +39,7 @@ class Tonemap : public Render GLUniform &uExposure() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/world/entity.cpp b/doomsday/apps/gloom/gloom/world/entity.cpp index b75999cacb..138ea333e6 100644 --- a/doomsday/apps/gloom/gloom/world/entity.cpp +++ b/doomsday/apps/gloom/gloom/world/entity.cpp @@ -22,7 +22,7 @@ using namespace de; namespace gloom { -DENG2_PIMPL_NOREF(Entity) +DE_PIMPL_NOREF(Entity) { ID id; Type type{Tree1}; diff --git a/doomsday/apps/gloom/gloom/world/entity.h b/doomsday/apps/gloom/gloom/world/entity.h index 70c5956905..770834c5d0 100644 --- a/doomsday/apps/gloom/gloom/world/entity.h +++ b/doomsday/apps/gloom/gloom/world/entity.h @@ -59,7 +59,7 @@ class Entity float angle() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/world/entitymap.cpp b/doomsday/apps/gloom/gloom/world/entitymap.cpp index a108d68b98..dd001e083a 100644 --- a/doomsday/apps/gloom/gloom/world/entitymap.cpp +++ b/doomsday/apps/gloom/gloom/world/entitymap.cpp @@ -22,7 +22,7 @@ using namespace de; namespace gloom { -DENG2_PIMPL(EntityMap) +DE_PIMPL(EntityMap) { struct Block { QList entities; // owned diff --git a/doomsday/apps/gloom/gloom/world/entitymap.h b/doomsday/apps/gloom/gloom/world/entitymap.h index 70940e13aa..d0beb475d1 100644 --- a/doomsday/apps/gloom/gloom/world/entitymap.h +++ b/doomsday/apps/gloom/gloom/world/entitymap.h @@ -44,7 +44,7 @@ class EntityMap std::function callback) const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/world/environment.cpp b/doomsday/apps/gloom/gloom/world/environment.cpp index 138da0b12b..aaa735c17b 100644 --- a/doomsday/apps/gloom/gloom/world/environment.cpp +++ b/doomsday/apps/gloom/gloom/world/environment.cpp @@ -24,7 +24,7 @@ using namespace de; namespace gloom { -DENG2_PIMPL(Environment) +DE_PIMPL(Environment) { World * world; QSet sounds; diff --git a/doomsday/apps/gloom/gloom/world/environment.h b/doomsday/apps/gloom/gloom/world/environment.h index 48ceeb6ac6..8bd03d90ec 100644 --- a/doomsday/apps/gloom/gloom/world/environment.h +++ b/doomsday/apps/gloom/gloom/world/environment.h @@ -37,7 +37,7 @@ class Environment void advanceTime(de::TimeSpan const &elapsed); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/world/map.cpp b/doomsday/apps/gloom/gloom/world/map.cpp index ea879fe705..5689787293 100644 --- a/doomsday/apps/gloom/gloom/world/map.cpp +++ b/doomsday/apps/gloom/gloom/world/map.cpp @@ -29,7 +29,7 @@ using namespace de; namespace gloom { -DENG2_PIMPL(Map) +DE_PIMPL(Map) { ID idGen{0}; Vec3d metersPerUnit{1.0, 1.0, 1.0}; @@ -76,12 +76,12 @@ void Map::clear() void Map::removeInvalid() { - DENG2_ASSERT(!d->points.contains(0)); - DENG2_ASSERT(!d->planes.contains(0)); - DENG2_ASSERT(!d->lines.contains(0)); - DENG2_ASSERT(!d->sectors.contains(0)); - DENG2_ASSERT(!d->volumes.contains(0)); - DENG2_ASSERT(!d->entities.contains(0)); + DE_ASSERT(!d->points.contains(0)); + DE_ASSERT(!d->planes.contains(0)); + DE_ASSERT(!d->lines.contains(0)); + DE_ASSERT(!d->sectors.contains(0)); + DE_ASSERT(!d->volumes.contains(0)); + DE_ASSERT(!d->entities.contains(0)); // Lines. { @@ -251,36 +251,36 @@ const Entities &Map::entities() const Point &Map::point(ID id) { - DENG2_ASSERT(id != 0); - DENG2_ASSERT(d->points.contains(id)); + DE_ASSERT(id != 0); + DE_ASSERT(d->points.contains(id)); return d->points[id]; } Line &Map::line(ID id) { - DENG2_ASSERT(id != 0); - DENG2_ASSERT(d->lines.contains(id)); + DE_ASSERT(id != 0); + DE_ASSERT(d->lines.contains(id)); return d->lines[id]; } Plane &Map::plane(ID id) { - DENG2_ASSERT(id != 0); - DENG2_ASSERT(d->planes.contains(id)); + DE_ASSERT(id != 0); + DE_ASSERT(d->planes.contains(id)); return d->planes[id]; } Sector &Map::sector(ID id) { - DENG2_ASSERT(id != 0); - DENG2_ASSERT(d->sectors.contains(id)); + DE_ASSERT(id != 0); + DE_ASSERT(d->sectors.contains(id)); return d->sectors[id]; } Volume &Map::volume(ID id) { - DENG2_ASSERT(id != 0); - DENG2_ASSERT(d->volumes.contains(id)); + DE_ASSERT(id != 0); + DE_ASSERT(d->volumes.contains(id)); return d->volumes[id]; } @@ -291,43 +291,43 @@ Entity &Map::entity(ID id) const Point &Map::point(ID id) const { - DENG2_ASSERT(id != 0); - DENG2_ASSERT(d->points.contains(id)); + DE_ASSERT(id != 0); + DE_ASSERT(d->points.contains(id)); return d->points[id]; } const Line &Map::line(ID id) const { - DENG2_ASSERT(id != 0); - DENG2_ASSERT(d->lines.contains(id)); + DE_ASSERT(id != 0); + DE_ASSERT(d->lines.contains(id)); return d->lines[id]; } const Plane &Map::plane(ID id) const { - DENG2_ASSERT(id != 0); - DENG2_ASSERT(d->planes.contains(id)); + DE_ASSERT(id != 0); + DE_ASSERT(d->planes.contains(id)); return d->planes[id]; } const Sector &Map::sector(ID id) const { - DENG2_ASSERT(id != 0); - DENG2_ASSERT(d->sectors.contains(id)); + DE_ASSERT(id != 0); + DE_ASSERT(d->sectors.contains(id)); return d->sectors[id]; } const Volume &Map::volume(ID id) const { - DENG2_ASSERT(id != 0); - DENG2_ASSERT(d->volumes.contains(id)); + DE_ASSERT(id != 0); + DE_ASSERT(d->volumes.contains(id)); return d->volumes[id]; } const Entity &Map::entity(ID id) const { - DENG2_ASSERT(id != 0); - DENG2_ASSERT(d->entities.contains(id)); + DE_ASSERT(id != 0); + DE_ASSERT(d->entities.contains(id)); return *d->entities[id]; } @@ -428,7 +428,7 @@ IDList Map::findLinesStartingFrom(ID pointId, Line::Side side) const geo::Line2d Map::geoLine(ID lineId) const { - DENG2_ASSERT(d->lines.contains(lineId)); + DE_ASSERT(d->lines.contains(lineId)); const auto &line = d->lines[lineId]; return geo::Line2d{point(line.points[0]).coord, point(line.points[1]).coord}; } @@ -541,7 +541,7 @@ bool Map::buildSector(Edge startSide, sectorPoints.clear(); - //DENG2_ASSERT(sourceLines.contains(startSide.line)); + //DE_ASSERT(sourceLines.contains(startSide.line)); Edge at = startSide; for (;;) diff --git a/doomsday/apps/gloom/gloom/world/map.h b/doomsday/apps/gloom/gloom/world/map.h index 6074899b22..e47ab2ff55 100644 --- a/doomsday/apps/gloom/gloom/world/map.h +++ b/doomsday/apps/gloom/gloom/world/map.h @@ -214,7 +214,7 @@ class Map void deserialize(const Block &data); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/world/mapimport.cpp b/doomsday/apps/gloom/gloom/world/mapimport.cpp index 9ae3096eed..1be537d0f1 100644 --- a/doomsday/apps/gloom/gloom/world/mapimport.cpp +++ b/doomsday/apps/gloom/gloom/world/mapimport.cpp @@ -51,7 +51,7 @@ static inline uint16_t le16u(uint16_t leValue) # define PACKED_STRUCT #endif -DENG2_PIMPL_NOREF(MapImport) +DE_PIMPL_NOREF(MapImport) { const res::LumpCatalog &lumps; res::IdTech1FlatLib flatLib; @@ -477,7 +477,7 @@ void MapImport::exportPackage(const String &packageRootPath) const os << " diffuse: " << imgPath << "\n}\n\n"; const auto image = materialImage(name); - DENG2_ASSERT(!image.isNull()); + DE_ASSERT(!image.isNull()); Block imgData; { diff --git a/doomsday/apps/gloom/gloom/world/mapimport.h b/doomsday/apps/gloom/gloom/world/mapimport.h index 6105560d21..3f65ca2c76 100644 --- a/doomsday/apps/gloom/gloom/world/mapimport.h +++ b/doomsday/apps/gloom/gloom/world/mapimport.h @@ -51,7 +51,7 @@ class MapImport void exportPackage(const String &packageRootPath) const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/world/sectorpolygonizer.cpp b/doomsday/apps/gloom/gloom/world/sectorpolygonizer.cpp index fe51fea860..961e64c52a 100644 --- a/doomsday/apps/gloom/gloom/world/sectorpolygonizer.cpp +++ b/doomsday/apps/gloom/gloom/world/sectorpolygonizer.cpp @@ -24,7 +24,7 @@ namespace gloom { using namespace geo; -DENG2_PIMPL(SectorPolygonizer) +DE_PIMPL(SectorPolygonizer) { struct Contour { @@ -560,7 +560,7 @@ DENG2_PIMPL(SectorPolygonizer) for (const auto &pp : cont.polygon.points) { - DENG2_ASSERT(points.isEmpty() || points.back() != pp.id); + DE_ASSERT(points.isEmpty() || points.back() != pp.id); points << pp.id; } } diff --git a/doomsday/apps/gloom/gloom/world/sectorpolygonizer.h b/doomsday/apps/gloom/gloom/world/sectorpolygonizer.h index 0170e27e36..c300c0b972 100644 --- a/doomsday/apps/gloom/gloom/world/sectorpolygonizer.h +++ b/doomsday/apps/gloom/gloom/world/sectorpolygonizer.h @@ -33,7 +33,7 @@ class SectorPolygonizer void polygonize(ID sector, const QVector &boundaryLines); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace gloom diff --git a/doomsday/apps/gloom/gloom/world/user.cpp b/doomsday/apps/gloom/gloom/world/user.cpp index be490cf8fc..dfb9a914a9 100644 --- a/doomsday/apps/gloom/gloom/world/user.cpp +++ b/doomsday/apps/gloom/gloom/world/user.cpp @@ -27,7 +27,7 @@ using namespace de; namespace gloom { -DENG2_PIMPL(User) +DE_PIMPL(User) { World const *world = nullptr; @@ -65,7 +65,7 @@ DENG2_PIMPL(User) ~Impl() { - DENG2_FOR_PUBLIC_AUDIENCE(Deletion, i) i->userBeingDeleted(self()); + DE_FOR_PUBLIC_AUDIENCE(Deletion, i) i->userBeingDeleted(self()); } Vec3f frontVector() const @@ -264,17 +264,17 @@ DENG2_PIMPL(User) } // Notifications. - DENG2_FOR_PUBLIC_AUDIENCE(PainLevel, i) { i->userPainLevel(self(), crouch / maxCrouch); } + DE_FOR_PUBLIC_AUDIENCE(PainLevel, i) { i->userPainLevel(self(), crouch / maxCrouch); } if (prevPosition != self().position()) { - DENG2_FOR_PUBLIC_AUDIENCE(Move, i) { i->userMoved(self(), self().position()); } + DE_FOR_PUBLIC_AUDIENCE(Move, i) { i->userMoved(self(), self().position()); } prevPosition = self().position(); } if (!fequal(prevYaw, yaw)) { - DENG2_FOR_PUBLIC_AUDIENCE(Turn, i) { i->userTurned(self(), yaw); } + DE_FOR_PUBLIC_AUDIENCE(Turn, i) { i->userTurned(self(), yaw); } prevYaw = yaw; } @@ -381,7 +381,7 @@ void User::setPosition(Vec3f const &pos) if ((oldPos - pos).length() > 15) { - DENG2_FOR_AUDIENCE(Warp, i) i->userWarped(*this); + DE_FOR_AUDIENCE(Warp, i) i->userWarped(*this); } } @@ -393,7 +393,7 @@ void User::setYaw(float yaw) void User::setPain(float pain) { - DENG2_FOR_AUDIENCE(PainLevel, i) { i->userPainLevel(*this, pain); } + DE_FOR_AUDIENCE(PainLevel, i) { i->userPainLevel(*this, pain); } } void User::setInputState(InputState const &state) diff --git a/doomsday/apps/gloom/gloom/world/user.h b/doomsday/apps/gloom/gloom/world/user.h index 16b16c7289..6a58f8d98d 100644 --- a/doomsday/apps/gloom/gloom/world/user.h +++ b/doomsday/apps/gloom/gloom/world/user.h @@ -44,11 +44,11 @@ class User }; Q_DECLARE_FLAGS(InputState, InputBit) - DENG2_DEFINE_AUDIENCE(Deletion, void userBeingDeleted (User &)) - DENG2_DEFINE_AUDIENCE(Warp, void userWarped (User const &)) - DENG2_DEFINE_AUDIENCE(PainLevel, void userPainLevel (User const &, float pain)) - DENG2_DEFINE_AUDIENCE(Move, void userMoved (User const &, de::Vec3f const &pos)) - DENG2_DEFINE_AUDIENCE(Turn, void userTurned (User const &, float yaw)) + DE_DEFINE_AUDIENCE(Deletion, void userBeingDeleted (User &)) + DE_DEFINE_AUDIENCE(Warp, void userWarped (User const &)) + DE_DEFINE_AUDIENCE(PainLevel, void userPainLevel (User const &, float pain)) + DE_DEFINE_AUDIENCE(Move, void userMoved (User const &, de::Vec3f const &pos)) + DE_DEFINE_AUDIENCE(Turn, void userTurned (User const &, float yaw)) public: User(); @@ -69,7 +69,7 @@ class User de::Sound & fastWindSound(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; Q_DECLARE_OPERATORS_FOR_FLAGS(User::InputState) diff --git a/doomsday/apps/gloom/gloom/world/world.h b/doomsday/apps/gloom/gloom/world/world.h index 6bab5e52b3..2609f8a27a 100644 --- a/doomsday/apps/gloom/gloom/world/world.h +++ b/doomsday/apps/gloom/gloom/world/world.h @@ -61,10 +61,10 @@ class World : public de::Deletable virtual double groundSurfaceHeight(const Vec3d &posMeters) const; virtual double ceilingHeight(const Vec3d &posMeters) const; - DENG2_CAST_METHODS() + DE_CAST_METHODS() public: - DENG2_DEFINE_AUDIENCE(Ready, void worldReady(World &)) + DE_DEFINE_AUDIENCE(Ready, void worldReady(World &)) }; } // namespace gloom diff --git a/doomsday/apps/gloom/net.dengine.gloom.pack/shaders/app/fx_blur.dei b/doomsday/apps/gloom/net.dengine.gloom.pack/shaders/app/fx_blur.dei index 18713ffe23..851afec0f6 100644 --- a/doomsday/apps/gloom/net.dengine.gloom.pack/shaders/app/fx_blur.dei +++ b/doomsday/apps/gloom/net.dengine.gloom.pack/shaders/app/fx_blur.dei @@ -5,12 +5,12 @@ group fx.blur { uniform vec4 uColor; uniform vec4 uWindow; - DENG_ATTRIB vec4 aVertex; - DENG_ATTRIB vec2 aUV; - DENG_ATTRIB vec4 aColor; + DE_ATTRIB vec4 aVertex; + DE_ATTRIB vec2 aUV; + DE_ATTRIB vec4 aColor; - DENG_VAR vec2 vUV; - DENG_VAR vec4 vColor; + DE_VAR vec2 vUV; + DE_VAR vec4 vColor; void main(void) { gl_Position = uMvpMatrix * aVertex; @@ -23,8 +23,8 @@ group fx.blur { fragment = " uniform sampler2D uTex; uniform vec2 uBlurStep; - DENG_VAR vec2 vUV; - DENG_VAR vec4 vColor; + DE_VAR vec2 vUV; + DE_VAR vec4 vColor; void main(void) { vec4 sum = vec4(0.0); sum += texture(uTex, vec2(vUV.s - 4.0 * uBlurStep.s, vUV.t)) * 0.05; @@ -46,8 +46,8 @@ group fx.blur { fragment = " uniform sampler2D uTex; uniform vec2 uBlurStep; - DENG_VAR vec2 vUV; - DENG_VAR vec4 vColor; + DE_VAR vec2 vUV; + DE_VAR vec4 vColor; void main(void) { vec4 sum = vec4(0.0); sum += texture(uTex, vec2(vUV.s, vUV.t - 4.0 * uBlurStep.t)) * 0.05; diff --git a/doomsday/apps/gloom/net.dengine.gloom.pack/shaders/app/generic.dei b/doomsday/apps/gloom/net.dengine.gloom.pack/shaders/app/generic.dei index 93532eacd2..de0bf882f5 100644 --- a/doomsday/apps/gloom/net.dengine.gloom.pack/shaders/app/generic.dei +++ b/doomsday/apps/gloom/net.dengine.gloom.pack/shaders/app/generic.dei @@ -8,16 +8,16 @@ group generic vertex = " uniform mat4 uMvpMatrix; uniform vec4 uColor; - DENG_ATTRIB vec4 aVertex; - DENG_ATTRIB vec4 aColor; - DENG_VAR vec4 vColor; + DE_ATTRIB vec4 aVertex; + DE_ATTRIB vec4 aColor; + DE_VAR vec4 vColor; void main(void) { gl_Position = uMvpMatrix * aVertex; vColor = uColor * aColor; }" fragment = " - DENG_VAR vec4 vColor; + DE_VAR vec4 vColor; void main(void) { out_FragColor = vColor; @@ -28,9 +28,9 @@ group generic { vertex = " uniform mat4 uMvpMatrix; - DENG_ATTRIB vec4 aVertex; - DENG_ATTRIB vec2 aUV; - DENG_VAR vec2 vUV; + DE_ATTRIB vec4 aVertex; + DE_ATTRIB vec2 aUV; + DE_VAR vec2 vUV; void main(void) { gl_Position = uMvpMatrix * aVertex; @@ -38,7 +38,7 @@ group generic }" fragment = " uniform sampler2D uTex; - DENG_VAR vec2 vUV; + DE_VAR vec2 vUV; void main(void) { out_FragColor = texture(uTex, vUV); @@ -53,11 +53,11 @@ group generic { vertex = " uniform mat4 uMvpMatrix; - DENG_ATTRIB vec4 aVertex; - DENG_ATTRIB vec2 aUV; - DENG_ATTRIB vec4 aColor; - DENG_VAR vec2 vUV; - DENG_VAR vec4 vColor; + DE_ATTRIB vec4 aVertex; + DE_ATTRIB vec2 aUV; + DE_ATTRIB vec4 aColor; + DE_VAR vec2 vUV; + DE_VAR vec4 vColor; void main(void) { gl_Position = uMvpMatrix * aVertex; @@ -66,8 +66,8 @@ group generic }" fragment = " uniform sampler2D uTex; - DENG_VAR vec2 vUV; - DENG_VAR vec4 vColor; + DE_VAR vec2 vUV; + DE_VAR vec4 vColor; void main(void) { out_FragColor = vColor * texture(uTex, vUV); @@ -82,11 +82,11 @@ group generic vertex = " uniform mat4 uMvpMatrix; uniform vec4 uColor; - DENG_ATTRIB vec4 aVertex; - DENG_ATTRIB vec2 aUV; - DENG_ATTRIB vec4 aColor; - DENG_VAR vec2 vUV; - DENG_VAR vec4 vColor; + DE_ATTRIB vec4 aVertex; + DE_ATTRIB vec2 aUV; + DE_ATTRIB vec4 aColor; + DE_VAR vec2 vUV; + DE_VAR vec4 vColor; void main(void) { gl_Position = uMvpMatrix * aVertex; @@ -95,8 +95,8 @@ group generic }" fragment = " uniform sampler2D uTex; - DENG_VAR vec2 vUV; - DENG_VAR vec4 vColor; + DE_VAR vec2 vUV; + DE_VAR vec4 vColor; void main(void) { out_FragColor = vColor * texture(uTex, vUV); diff --git a/doomsday/apps/gloom/net.dengine.gloom.pack/shaders/app/ui.dei b/doomsday/apps/gloom/net.dengine.gloom.pack/shaders/app/ui.dei index 64dccabcd4..6e5da57450 100644 --- a/doomsday/apps/gloom/net.dengine.gloom.pack/shaders/app/ui.dei +++ b/doomsday/apps/gloom/net.dengine.gloom.pack/shaders/app/ui.dei @@ -3,19 +3,19 @@ ui { shader guiwidget.batch { vertex = " uniform mat4 uMvpMatrix; - uniform vec4 uColor[DENG_MAX_BATCH_UNIFORMS]; - uniform float uSaturation[DENG_MAX_BATCH_UNIFORMS]; - uniform vec4 uScissorRect[DENG_MAX_BATCH_UNIFORMS]; + uniform vec4 uColor[DE_MAX_BATCH_UNIFORMS]; + uniform float uSaturation[DE_MAX_BATCH_UNIFORMS]; + uniform vec4 uScissorRect[DE_MAX_BATCH_UNIFORMS]; - DENG_ATTRIB vec4 aVertex; - DENG_ATTRIB vec2 aUV; - DENG_ATTRIB vec4 aColor; - DENG_ATTRIB float aIndex; // uColor + DE_ATTRIB vec4 aVertex; + DE_ATTRIB vec2 aUV; + DE_ATTRIB vec4 aColor; + DE_ATTRIB float aIndex; // uColor - DENG_VAR vec2 vUV; - DENG_VAR vec4 vColor; - DENG_VAR vec4 vScissor; - DENG_VAR float vSaturation; + DE_VAR vec2 vUV; + DE_VAR vec4 vColor; + DE_VAR vec4 vScissor; + DE_VAR float vSaturation; void main(void) { gl_Position = uMvpMatrix * aVertex; @@ -30,10 +30,10 @@ ui { #include 'hsv.glsl' uniform sampler2D uTex; - DENG_VAR vec2 vUV; - DENG_VAR vec4 vColor; - DENG_VAR vec4 vScissor; - DENG_VAR float vSaturation; + DE_VAR vec2 vUV; + DE_VAR vec4 vColor; + DE_VAR vec4 vScissor; + DE_VAR float vSaturation; void main(void) { // Check the scissor first. diff --git a/doomsday/apps/gloom/net.dengine.gloom.pack/shaders/common/vertex_uv.vsh b/doomsday/apps/gloom/net.dengine.gloom.pack/shaders/common/vertex_uv.vsh index 4b9dba4f14..eab564d0cc 100644 --- a/doomsday/apps/gloom/net.dengine.gloom.pack/shaders/common/vertex_uv.vsh +++ b/doomsday/apps/gloom/net.dengine.gloom.pack/shaders/common/vertex_uv.vsh @@ -1,5 +1,5 @@ -DENG_ATTRIB vec4 aVertex; -DENG_ATTRIB vec2 aUV; +DE_ATTRIB vec4 aVertex; +DE_ATTRIB vec2 aUV; out vec2 vUV; diff --git a/doomsday/apps/gloom/net.dengine.gloom.pack/shaders/ssao_denoise.fsh b/doomsday/apps/gloom/net.dengine.gloom.pack/shaders/ssao_denoise.fsh index 9ca8dd1af5..135d3c8ad6 100644 --- a/doomsday/apps/gloom/net.dengine.gloom.pack/shaders/ssao_denoise.fsh +++ b/doomsday/apps/gloom/net.dengine.gloom.pack/shaders/ssao_denoise.fsh @@ -2,11 +2,11 @@ uniform sampler2D uNoisyFactors; -//#define DENG_SSAO_DISABLE_BLUR +//#define DE_SSAO_DISABLE_BLUR void main() { ivec2 fragCoord = ivec2(gl_FragCoord.xy); -#if defined (DENG_SSAO_DISABLE_BLUR) +#if defined (DE_SSAO_DISABLE_BLUR) // Pass through the noisy factor values. out_FragColor = vec4(texelFetch(uNoisyFactors, fragCoord, 0).r); #else diff --git a/doomsday/apps/gloom/src/approotwidget.cpp b/doomsday/apps/gloom/src/approotwidget.cpp index 4a28d26fad..2a160e1e1e 100644 --- a/doomsday/apps/gloom/src/approotwidget.cpp +++ b/doomsday/apps/gloom/src/approotwidget.cpp @@ -22,7 +22,7 @@ using namespace de; -DENG2_PIMPL(AppRootWidget) +DE_PIMPL(AppRootWidget) { Impl(Public * i) : Base(i) {} }; diff --git a/doomsday/apps/gloom/src/approotwidget.h b/doomsday/apps/gloom/src/approotwidget.h index c45554074d..f5657260cb 100644 --- a/doomsday/apps/gloom/src/approotwidget.h +++ b/doomsday/apps/gloom/src/approotwidget.h @@ -38,7 +38,7 @@ class AppRootWidget : public de::GuiRootWidget void handleEventAsFallback(de::Event const &event); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // APPROOTWIDGET_H diff --git a/doomsday/apps/gloom/src/appwindowsystem.cpp b/doomsday/apps/gloom/src/appwindowsystem.cpp index e69f3710ba..f339e70ece 100644 --- a/doomsday/apps/gloom/src/appwindowsystem.cpp +++ b/doomsday/apps/gloom/src/appwindowsystem.cpp @@ -22,7 +22,7 @@ using namespace de; -DENG2_PIMPL(AppWindowSystem) +DE_PIMPL(AppWindowSystem) { Impl(Public *i) : Base(i) { diff --git a/doomsday/apps/gloom/src/appwindowsystem.h b/doomsday/apps/gloom/src/appwindowsystem.h index 737f29700b..b243948f6a 100644 --- a/doomsday/apps/gloom/src/appwindowsystem.h +++ b/doomsday/apps/gloom/src/appwindowsystem.h @@ -34,7 +34,7 @@ class AppWindowSystem : public de::WindowSystem void rootUpdate(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // APPWINDOWSYSTEM_H diff --git a/doomsday/apps/gloom/src/editor.cpp b/doomsday/apps/gloom/src/editor.cpp index 62fcd81dd4..7c4a341a6a 100644 --- a/doomsday/apps/gloom/src/editor.cpp +++ b/doomsday/apps/gloom/src/editor.cpp @@ -70,7 +70,7 @@ enum Direction { Q_DECLARE_FLAGS(Directions, Direction) Q_DECLARE_OPERATORS_FOR_FLAGS(Directions) -DENG2_PIMPL(Editor) +DE_PIMPL(Editor) { enum UserAction { None, @@ -1021,7 +1021,7 @@ DENG2_PIMPL(Editor) mapId.clear(); QFile f(path); - DENG2_ASSERT(f.exists()); + DE_ASSERT(f.exists()); f.open(QFile::ReadOnly); map.deserialize(f.readAll()); resetState(); diff --git a/doomsday/apps/gloom/src/editor.h b/doomsday/apps/gloom/src/editor.h index 30b8622caf..0e534c2635 100644 --- a/doomsday/apps/gloom/src/editor.h +++ b/doomsday/apps/gloom/src/editor.h @@ -61,7 +61,7 @@ class Editor : public QWidget void buildMapRequested(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // GLOOM_EDITOR_H diff --git a/doomsday/apps/gloom/src/editorwindow.cpp b/doomsday/apps/gloom/src/editorwindow.cpp index 1e5d115a12..44827c3042 100644 --- a/doomsday/apps/gloom/src/editorwindow.cpp +++ b/doomsday/apps/gloom/src/editorwindow.cpp @@ -27,7 +27,7 @@ using namespace de; using namespace gloom; -DENG2_PIMPL(EditorWindow) +DE_PIMPL(EditorWindow) { Editor *editor; bool stateBeingUpdated = false; diff --git a/doomsday/apps/gloom/src/editorwindow.h b/doomsday/apps/gloom/src/editorwindow.h index 190fe91e34..e521f39776 100644 --- a/doomsday/apps/gloom/src/editorwindow.h +++ b/doomsday/apps/gloom/src/editorwindow.h @@ -34,7 +34,7 @@ class EditorWindow : public QMainWindow void closeEvent(QCloseEvent *event) override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // EDITORWINDOW_H diff --git a/doomsday/apps/gloom/src/globalshortcuts.cpp b/doomsday/apps/gloom/src/globalshortcuts.cpp index fca89fcf4f..9731b28b2e 100644 --- a/doomsday/apps/gloom/src/globalshortcuts.cpp +++ b/doomsday/apps/gloom/src/globalshortcuts.cpp @@ -23,7 +23,7 @@ using namespace de; -DENG2_PIMPL_NOREF(GlobalShortcuts) +DE_PIMPL_NOREF(GlobalShortcuts) {}; GlobalShortcuts::GlobalShortcuts() diff --git a/doomsday/apps/gloom/src/globalshortcuts.h b/doomsday/apps/gloom/src/globalshortcuts.h index 4b7e840aae..59e7907260 100644 --- a/doomsday/apps/gloom/src/globalshortcuts.h +++ b/doomsday/apps/gloom/src/globalshortcuts.h @@ -30,7 +30,7 @@ class GlobalShortcuts : public de::Widget bool handleEvent(de::Event const &event); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // GLOBALSHORTCUTS_H diff --git a/doomsday/apps/gloom/src/gloomapp.cpp b/doomsday/apps/gloom/src/gloomapp.cpp index 89d4d696b5..1bc04632bb 100644 --- a/doomsday/apps/gloom/src/gloomapp.cpp +++ b/doomsday/apps/gloom/src/gloomapp.cpp @@ -32,7 +32,7 @@ using namespace de; using namespace gloom; -DENG2_PIMPL(GloomApp) +DE_PIMPL(GloomApp) { ImageBank images; std::unique_ptr editWin; @@ -63,7 +63,7 @@ DENG2_PIMPL(GloomApp) // Load all the shader program definitions. FS::FoundFiles found; self().findInPackages("shaders.dei", found); - DENG2_FOR_EACH(FS::FoundFiles, i, found) + DE_FOR_EACH(FS::FoundFiles, i, found) { LOG_MSG("Loading shader definitions from %s") << (*i)->description(); self().shaders().addFromInfo(**i); @@ -166,7 +166,7 @@ QDir GloomApp::userDir() const GloomApp &GloomApp::app() { - return *static_cast(DENG2_APP); + return *static_cast(DE_APP); } AppWindowSystem &GloomApp::windowSystem() diff --git a/doomsday/apps/gloom/src/gloomapp.h b/doomsday/apps/gloom/src/gloomapp.h index 798fc1ee94..52239e8fe0 100644 --- a/doomsday/apps/gloom/src/gloomapp.h +++ b/doomsday/apps/gloom/src/gloomapp.h @@ -42,7 +42,7 @@ class GloomApp : public de::BaseGuiApp static de::ImageBank & images(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // GLOOM_TEST_APP_H diff --git a/doomsday/apps/gloom/src/main.cpp b/doomsday/apps/gloom/src/main.cpp index 6f47771dd2..ee9fa9de28 100644 --- a/doomsday/apps/gloom/src/main.cpp +++ b/doomsday/apps/gloom/src/main.cpp @@ -42,9 +42,9 @@ int main(int argc, char **argv) return -1; } -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG // Check that all reference-counted objects have been deleted. - DENG2_ASSERT(Counted::totalCount == 0); + DE_ASSERT(Counted::totalCount == 0); #endif return 0; } diff --git a/doomsday/apps/gloom/src/mainwindow.cpp b/doomsday/apps/gloom/src/mainwindow.cpp index 31921169ce..f760b61978 100644 --- a/doomsday/apps/gloom/src/mainwindow.cpp +++ b/doomsday/apps/gloom/src/mainwindow.cpp @@ -31,10 +31,10 @@ using namespace de; using namespace gloom; -DENG2_PIMPL(MainWindow) -, DENG2_OBSERVES(GLWindow, Init) -, DENG2_OBSERVES(GLWindow, Resize) -, DENG2_OBSERVES(WindowEventHandler, FocusChange) +DE_PIMPL(MainWindow) +, DE_OBSERVES(GLWindow, Init) +, DE_OBSERVES(GLWindow, Resize) +, DE_OBSERVES(WindowEventHandler, FocusChange) { AppRootWidget root; bool needRootSizeUpdate{false}; @@ -110,7 +110,7 @@ DENG2_PIMPL(MainWindow) void updateRootSize() { - DENG2_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_IN_MAIN_THREAD(); needRootSizeUpdate = false; @@ -167,7 +167,7 @@ void MainWindow::preDraw() // NOTE: This occurs during the Canvas paintGL event. BaseWindow::preDraw(); - DENG2_ASSERT_IN_MAIN_THREAD(); + DE_ASSERT_IN_MAIN_THREAD(); if (d->needRootSizeUpdate) { d->updateRootSize(); diff --git a/doomsday/apps/gloom/src/mainwindow.h b/doomsday/apps/gloom/src/mainwindow.h index 6372c5b97c..79beb220a3 100644 --- a/doomsday/apps/gloom/src/mainwindow.h +++ b/doomsday/apps/gloom/src/mainwindow.h @@ -43,7 +43,7 @@ class MainWindow : public de::BaseWindow bool handleFallbackEvent(de::Event const &event) override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // MAINWINDOW_H diff --git a/doomsday/apps/libdoomsday/CMakeLists.txt b/doomsday/apps/libdoomsday/CMakeLists.txt index 65af660933..3344cbeca7 100644 --- a/doomsday/apps/libdoomsday/CMakeLists.txt +++ b/doomsday/apps/libdoomsday/CMakeLists.txt @@ -1,7 +1,7 @@ # Doomsday Engine -- libdoomsday cmake_minimum_required (VERSION 3.1) -project (DENG_LIBDOOMSDAY) +project (DE_LIBDOOMSDAY) include (../../cmake/Config.cmake) # Dependencies. @@ -13,15 +13,15 @@ include (ZLIB) # Definitions. add_definitions ( - -D__DENG__=1 + -D__DE__=1 -D__LIBDOOMSDAY__=1 ) # Set up the API. -include_directories (${DENG_API_DIR}) +include_directories (${DE_API_DIR}) configure_file ( - ${DENG_API_DIR}/dd_version.h.in - ${DENG_API_DIR}/dd_version.h + ${DE_API_DIR}/dd_version.h.in + ${DE_API_DIR}/dd_version.h ) # Source and header files. @@ -45,7 +45,7 @@ target_link_libraries (libdoomsday ) target_include_directories (libdoomsday PRIVATE ${ZLIB_INCLUDE_DIR}) -if (DENG_ENABLE_SDK) +if (DE_ENABLE_SDK) install (DIRECTORY include/doomsday DESTINATION include COMPONENT sdk diff --git a/doomsday/apps/libdoomsday/api.doxy b/doomsday/apps/libdoomsday/api.doxy index 47e21229a2..ee6cf1b5b1 100644 --- a/doomsday/apps/libdoomsday/api.doxy +++ b/doomsday/apps/libdoomsday/api.doxy @@ -12,14 +12,14 @@ OUTPUT_DIRECTORY = ../../apidoc/api/ INPUT = ../api include src PREDEFINED = __cplusplus __LIBDOOMSDAY__ \ "LIBDOOMSDAY_PUBLIC=" \ - "DENG2_PIMPL(ClassName)=typedef ClassName Public; struct ClassName::Instance : public de::Private" \ - "DENG2_PIMPL_NOREF(C)=struct C::Instance : public de::IPrivate" \ - "DENG_GUI_PIMPL(C)=struct C::public de::GuiWidgetPrivate" \ - "DENG2_PRIVATE(Var)=struct Instance; Instance *Var;" \ - "DENG2_ERROR(N)=class N : public de::Error {};" \ - "DENG2_SUB_ERROR(B,N)=class N : public B {};" \ - "DENG2_OBSERVES(C,A)=public C::I##Audience##Observer" \ - "DENG2_DEFINE_AUDIENCE2(Name,Method)=class I##Name##Observer { public: virtual ~I##Name##Observer() {} virtual Method = 0; }; typedef de::Observers Name##Audience; Name##Audience &audienceFor##Name(); Name##Audience const &audienceFor##Name() const;" + "DE_PIMPL(ClassName)=typedef ClassName Public; struct ClassName::Instance : public de::Private" \ + "DE_PIMPL_NOREF(C)=struct C::Instance : public de::IPrivate" \ + "DE_GUI_PIMPL(C)=struct C::public de::GuiWidgetPrivate" \ + "DE_PRIVATE(Var)=struct Instance; Instance *Var;" \ + "DE_ERROR(N)=class N : public de::Error {};" \ + "DE_SUB_ERROR(B,N)=class N : public B {};" \ + "DE_OBSERVES(C,A)=public C::I##Audience##Observer" \ + "DE_DEFINE_AUDIENCE2(Name,Method)=class I##Name##Observer { public: virtual ~I##Name##Observer() {} virtual Method = 0; }; typedef de::Observers Name##Audience; Name##Audience &audienceFor##Name(); Name##Audience const &audienceFor##Name() const;" INCLUDED_BY_GRAPH = YES REFERENCED_BY_RELATION = NO diff --git a/doomsday/apps/libdoomsday/include/doomsday/abstractsession.h b/doomsday/apps/libdoomsday/include/doomsday/abstractsession.h index 40c84f30df..984d8e28ee 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/abstractsession.h +++ b/doomsday/apps/libdoomsday/include/doomsday/abstractsession.h @@ -41,7 +41,7 @@ class LIBDOOMSDAY_PUBLIC AbstractSession { public: /// Current in-progress state does not match that expected. @ingroup errors - DENG2_ERROR(InProgressError); + DE_ERROR(InProgressError); public: AbstractSession(); @@ -138,7 +138,7 @@ class LIBDOOMSDAY_PUBLIC AbstractSession static void removeSaved(de::String const &path); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // LIBDOOMSDAY_SESSION_H diff --git a/doomsday/apps/libdoomsday/include/doomsday/busymode.h b/doomsday/apps/libdoomsday/include/doomsday/busymode.h index 1d242ae2a3..4aba7c1e2d 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/busymode.h +++ b/doomsday/apps/libdoomsday/include/doomsday/busymode.h @@ -147,14 +147,14 @@ class LIBDOOMSDAY_PUBLIC BusyMode void abort(de::String const &message); public: - DENG2_DEFINE_AUDIENCE2(Beginning, void busyModeWillBegin(BusyTask &firstTask)) - DENG2_DEFINE_AUDIENCE2(End, void busyModeEnded()) - DENG2_DEFINE_AUDIENCE2(Abort, void busyModeAborted(de::String const &message)) - DENG2_DEFINE_AUDIENCE2(TaskWillStart, void busyTaskWillStart(BusyTask &task)) - DENG2_DEFINE_AUDIENCE2(TaskComplete, void busyTaskCompleted(BusyTask &task)) + DE_DEFINE_AUDIENCE2(Beginning, void busyModeWillBegin(BusyTask &firstTask)) + DE_DEFINE_AUDIENCE2(End, void busyModeEnded()) + DE_DEFINE_AUDIENCE2(Abort, void busyModeAborted(de::String const &message)) + DE_DEFINE_AUDIENCE2(TaskWillStart, void busyTaskWillStart(BusyTask &task)) + DE_DEFINE_AUDIENCE2(TaskComplete, void busyTaskCompleted(BusyTask &task)) private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; LIBDOOMSDAY_EXTERN_C LIBDOOMSDAY_PUBLIC bool BusyMode_Active(); diff --git a/doomsday/apps/libdoomsday/include/doomsday/console/cmd.h b/doomsday/apps/libdoomsday/include/doomsday/console/cmd.h index cc03095912..2c7dcbff4c 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/console/cmd.h +++ b/doomsday/apps/libdoomsday/include/doomsday/console/cmd.h @@ -27,12 +27,12 @@ # include #endif -#define DENG_MAX_ARGS 256 +#define DE_MAX_ARGS 256 typedef struct { char cmdLine[2048]; int argc; - char *argv[DENG_MAX_ARGS]; + char *argv[DE_MAX_ARGS]; } cmdargs_t; /** @@ -74,7 +74,7 @@ typedef struct ccmd_s { int minArgs, maxArgs; /// List of argument types for this command. - cvartype_t args[DENG_MAX_ARGS]; + cvartype_t args[DE_MAX_ARGS]; } ccmd_t; /** @@ -122,7 +122,7 @@ typedef struct ccmd_s { ///@} /// Helper macro for declaring console command functions. @ingroup console -#define D_CMD(x) DENG_EXTERN_C int CCmd##x(byte src, int argc, char** argv) +#define D_CMD(x) DE_EXTERN_C int CCmd##x(byte src, int argc, char** argv) /** * Helper macro for registering new console commands. diff --git a/doomsday/apps/libdoomsday/include/doomsday/defs/ded.h b/doomsday/apps/libdoomsday/include/doomsday/defs/ded.h index 6a20a0e75b..11148c499f 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/defs/ded.h +++ b/doomsday/apps/libdoomsday/include/doomsday/defs/ded.h @@ -212,8 +212,8 @@ struct LIBDOOMSDAY_PUBLIC ded_s protected: void release(); - DENG2_NO_ASSIGN(ded_s) - DENG2_NO_COPY (ded_s) + DE_NO_ASSIGN(ded_s) + DE_NO_COPY (ded_s) }; typedef ded_s ded_t; diff --git a/doomsday/apps/libdoomsday/include/doomsday/defs/dedarray.h b/doomsday/apps/libdoomsday/include/doomsday/defs/dedarray.h index 3bc916f4e9..f56deb85f3 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/defs/dedarray.h +++ b/doomsday/apps/libdoomsday/include/doomsday/defs/dedarray.h @@ -60,7 +60,7 @@ struct LIBDOOMSDAY_PUBLIC DEDArray PODType *elements; ded_count_t count; - DENG2_NO_COPY (DEDArray) + DE_NO_COPY (DEDArray) public: DEDArray() : elements(0) {} @@ -68,7 +68,7 @@ struct LIBDOOMSDAY_PUBLIC DEDArray ~DEDArray() { // This should have been cleared by now. - DENG_ASSERT(elements == 0); + DE_ASSERT(elements == 0); } /// @note Previous elements are not released -- they must be cleared manually. @@ -116,15 +116,15 @@ struct LIBDOOMSDAY_PUBLIC DEDArray PODType const &at(int index) const { - DENG2_ASSERT(index >= 0); - DENG2_ASSERT(index < size()); + DE_ASSERT(index >= 0); + DE_ASSERT(index < size()); return elements[index]; } PODType &operator [] (int index) const { - DENG2_ASSERT(index >= 0); - DENG2_ASSERT(index < size()); + DE_ASSERT(index >= 0); + DE_ASSERT(index < size()); return elements[index]; } @@ -147,7 +147,7 @@ struct LIBDOOMSDAY_PUBLIC DEDArray */ PODType *append(int addedCount = 1) { - DENG2_ASSERT(addedCount >= 0); + DE_ASSERT(addedCount >= 0); int const first = count.num; @@ -166,8 +166,8 @@ struct LIBDOOMSDAY_PUBLIC DEDArray void removeAt(int index) { - DENG2_ASSERT(index >= 0); - DENG2_ASSERT(index < size()); + DE_ASSERT(index >= 0); + DE_ASSERT(index < size()); if (index < 0 || index >= size()) return; @@ -186,8 +186,8 @@ struct LIBDOOMSDAY_PUBLIC DEDArray void copyTo(int destIndex, int srcIndex) { - DENG2_ASSERT(destIndex >= 0 && destIndex < size()); - DENG2_ASSERT(srcIndex >= 0 && srcIndex < size()); + DE_ASSERT(destIndex >= 0 && destIndex < size()); + DE_ASSERT(srcIndex >= 0 && srcIndex < size()); // Free all existing allocations. elements[destIndex].release(); diff --git a/doomsday/apps/libdoomsday/include/doomsday/defs/dedparser.h b/doomsday/apps/libdoomsday/include/doomsday/defs/dedparser.h index 449fca0a49..6d8d73de9a 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/defs/dedparser.h +++ b/doomsday/apps/libdoomsday/include/doomsday/defs/dedparser.h @@ -40,7 +40,7 @@ class LIBDOOMSDAY_PUBLIC DEDParser int parse(char const *buffer, de::String sourceFile, bool sourceIsCustom); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // LIBDOOMSDAY_DED_V1_PARSER_H diff --git a/doomsday/apps/libdoomsday/include/doomsday/defs/dedregister.h b/doomsday/apps/libdoomsday/include/doomsday/defs/dedregister.h index 9247aa8785..41bffd5bbf 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/defs/dedregister.h +++ b/doomsday/apps/libdoomsday/include/doomsday/defs/dedregister.h @@ -42,11 +42,11 @@ class LIBDOOMSDAY_PUBLIC DEDRegister { public: /// The specified index or key value was not found from the register. @ingroup errors - DENG2_ERROR(NotFoundError); + DE_ERROR(NotFoundError); /// Attempted to use a key for looking up that hasn't been previously registered. /// @ingroup errors - DENG2_ERROR(UndefinedKeyError); + DE_ERROR(UndefinedKeyError); enum LookupFlag { @@ -115,7 +115,7 @@ class LIBDOOMSDAY_PUBLIC DEDRegister de::DictionaryValue const &lookup(de::String const &key) const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // LIBDOOMSDAY_DEDREGISTER_H diff --git a/doomsday/apps/libdoomsday/include/doomsday/defs/sprite.h b/doomsday/apps/libdoomsday/include/doomsday/defs/sprite.h index 1eed0d5ab2..fa82b9993d 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/defs/sprite.h +++ b/doomsday/apps/libdoomsday/include/doomsday/defs/sprite.h @@ -72,7 +72,7 @@ class LIBDOOMSDAY_PUBLIC Sprite : public Definition { public: /// Required view is missing. @ingroup errors - DENG2_ERROR(MissingViewError); + DE_ERROR(MissingViewError); struct LIBDOOMSDAY_PUBLIC View { diff --git a/doomsday/apps/libdoomsday/include/doomsday/doomsdayapp.h b/doomsday/apps/libdoomsday/include/doomsday/doomsdayapp.h index 283b63fc41..1ae0abad46 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/doomsdayapp.h +++ b/doomsday/apps/libdoomsday/include/doomsday/doomsdayapp.h @@ -51,17 +51,19 @@ class LIBDOOMSDAY_PUBLIC DoomsdayApp { public: /// Notified before the current game is unloaded. - DENG2_DEFINE_AUDIENCE2(GameUnload, void aboutToUnloadGame(Game const &gameBeingUnloaded)) + DE_DEFINE_AUDIENCE2(GameUnload, void aboutToUnloadGame(Game const &gameBeingUnloaded)) - DENG2_DEFINE_AUDIENCE2(GameLoad, void aboutToLoadGame(Game const &gameBeingLoaded)) + DE_DEFINE_AUDIENCE2(GameLoad, void aboutToLoadGame(Game const &gameBeingLoaded)) /// Notified after the current game has been changed. - DENG2_DEFINE_AUDIENCE2(GameChange, void currentGameChanged(Game const &newGame)) + DE_DEFINE_AUDIENCE2(GameChange, void currentGameChanged(Game const &newGame)) /// Notified when console variables and commands should be registered. - DENG2_DEFINE_AUDIENCE2(ConsoleRegistration, void consoleRegistration()) + DE_DEFINE_AUDIENCE2(ConsoleRegistration, void consoleRegistration()) - DENG2_DEFINE_AUDIENCE2(PeriodicAutosave, void periodicAutosave()) + DE_DEFINE_AUDIENCE2(FileRefresh, void aboutToRefreshFiles()) + + DE_DEFINE_AUDIENCE2(PeriodicAutosave, void periodicAutosave()) struct GameChangeParameters { @@ -246,7 +248,7 @@ class LIBDOOMSDAY_PUBLIC DoomsdayApp virtual void reset(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; /** diff --git a/doomsday/apps/libdoomsday/include/doomsday/filesys/file.h b/doomsday/apps/libdoomsday/include/doomsday/filesys/file.h index 4b2e2952d3..5b29ad52b7 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/filesys/file.h +++ b/doomsday/apps/libdoomsday/include/doomsday/filesys/file.h @@ -23,8 +23,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_FILESYS_FILE_H -#define LIBDENG_FILESYS_FILE_H +#ifndef DE_FILESYS_FILE_H +#define DE_FILESYS_FILE_H #include "../libdoomsday.h" #include "filehandle.h" @@ -64,7 +64,7 @@ class LIBDOOMSDAY_PUBLIC File1 Q_DECLARE_FLAGS(Flags, Flag) /// This file is not contained. @ingroup errors - DENG2_ERROR(NotContainedError); + DE_ERROR(NotContainedError); private: File1(); @@ -83,7 +83,7 @@ class LIBDOOMSDAY_PUBLIC File1 */ virtual ~File1(); - DENG2_CAST_METHODS() + DE_CAST_METHODS() /// @return Name of this file. virtual String const &name() const; @@ -274,4 +274,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(File1::Flags) } // namespace de -#endif /* LIBDENG_FILESYS_FILE_H */ +#endif /* DE_FILESYS_FILE_H */ diff --git a/doomsday/apps/libdoomsday/include/doomsday/filesys/filehandle.h b/doomsday/apps/libdoomsday/include/doomsday/filesys/filehandle.h index b2a9ecc2ee..410a106552 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/filesys/filehandle.h +++ b/doomsday/apps/libdoomsday/include/doomsday/filesys/filehandle.h @@ -23,8 +23,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_FILESYS_FILEHANDLE_H -#define LIBDENG_FILESYS_FILEHANDLE_H +#ifndef DE_FILESYS_FILEHANDLE_H +#define DE_FILESYS_FILEHANDLE_H #include "../libdoomsday.h" #include @@ -135,9 +135,9 @@ class LIBDOOMSDAY_PUBLIC FileHandle private: FileHandle(); - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace de -#endif /* LIBDENG_FILESYS_FILEHANDLE_H */ +#endif /* DE_FILESYS_FILEHANDLE_H */ diff --git a/doomsday/apps/libdoomsday/include/doomsday/filesys/fileid.h b/doomsday/apps/libdoomsday/include/doomsday/filesys/fileid.h index f8f5e65e05..9e2e9d8aef 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/filesys/fileid.h +++ b/doomsday/apps/libdoomsday/include/doomsday/filesys/fileid.h @@ -25,8 +25,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_FILEID_H -#define LIBDENG_FILEID_H +#ifndef DE_FILEID_H +#define DE_FILEID_H #include "../libdoomsday.h" #include @@ -61,14 +61,14 @@ class LIBDOOMSDAY_PUBLIC FileId : public LogEntry::Arg::Base friend void swap(FileId& first, FileId& second) // nothrow { -#ifdef DENG2_QT_4_8_OR_NEWER +#ifdef DE_QT_4_8_OR_NEWER first.md5_.swap(second.md5_); -# ifdef DENG_DEBUG +# ifdef DE_DEBUG first.path_.swap(second.path_); # endif #else std::swap(first.md5_, second.md5_); -# ifdef DENG_DEBUG +# ifdef DE_DEBUG std::swap(first.path_, second.path_); # endif #endif @@ -86,7 +86,7 @@ class LIBDOOMSDAY_PUBLIC FileId : public LogEntry::Arg::Base /// @return Md5hash for this FileId. Md5Hash const& md5() const { return md5_; } -#ifdef DENG_DEBUG +#ifdef DE_DEBUG /// @return Path attributed to this FileId. String const& path() const { return path_; } @@ -114,11 +114,11 @@ class LIBDOOMSDAY_PUBLIC FileId : public LogEntry::Arg::Base private: Md5Hash md5_; -#ifdef DENG_DEBUG +#ifdef DE_DEBUG String path_; #endif }; } // namespace de -#endif /* LIBDENG_FILEID_H */ +#endif /* DE_FILEID_H */ diff --git a/doomsday/apps/libdoomsday/include/doomsday/filesys/fileinfo.h b/doomsday/apps/libdoomsday/include/doomsday/filesys/fileinfo.h index f0d556dd4f..7a65d2a9eb 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/filesys/fileinfo.h +++ b/doomsday/apps/libdoomsday/include/doomsday/filesys/fileinfo.h @@ -25,8 +25,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_FILESYS_FILEINFO_H -#define LIBDENG_FILESYS_FILEINFO_H +#ifndef DE_FILESYS_FILEINFO_H +#define DE_FILESYS_FILEINFO_H #ifdef __cplusplus @@ -86,4 +86,4 @@ struct LIBDOOMSDAY_PUBLIC FileInfo #endif // __cplusplus -#endif /* LIBDENG_FILESYS_FILEINFO_H */ +#endif /* DE_FILESYS_FILEINFO_H */ diff --git a/doomsday/apps/libdoomsday/include/doomsday/filesys/filetype.h b/doomsday/apps/libdoomsday/include/doomsday/filesys/filetype.h index 572ee19d7e..5444aef3d1 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/filesys/filetype.h +++ b/doomsday/apps/libdoomsday/include/doomsday/filesys/filetype.h @@ -21,14 +21,14 @@ * 02110-1301 USA */ -#ifndef LIBDENG_FILETYPE_H -#define LIBDENG_FILETYPE_H +#ifndef DE_FILETYPE_H +#define DE_FILETYPE_H #include "../libdoomsday.h" #include "../resource/resourceclass.h" #ifdef __cplusplus -#ifndef DENG2_C_API_ONLY +#ifndef DE_C_API_ONLY #include #include @@ -190,7 +190,7 @@ LIBDOOMSDAY_PUBLIC de::FileType const &DD_GuessFileTypeFromFileName(de::String n /// Returns the registered file types for efficient traversal. LIBDOOMSDAY_PUBLIC de::FileTypes &DD_FileTypes(); -#endif // DENG2_C_API_ONLY +#endif // DE_C_API_ONLY #endif // __cplusplus -#endif /* LIBDENG_FILETYPE_H */ +#endif /* DE_FILETYPE_H */ diff --git a/doomsday/apps/libdoomsday/include/doomsday/filesys/fs_main.h b/doomsday/apps/libdoomsday/include/doomsday/filesys/fs_main.h index 9cee37f293..366e9794f3 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/filesys/fs_main.h +++ b/doomsday/apps/libdoomsday/include/doomsday/filesys/fs_main.h @@ -29,8 +29,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_FILESYS_MAIN_H -#define LIBDENG_FILESYS_MAIN_H +#ifndef DE_FILESYS_MAIN_H +#define DE_FILESYS_MAIN_H #include "file.h" #include "filehandle.h" @@ -40,13 +40,13 @@ #endif #ifdef WIN32 -# define DENG_DIR_SEP_CHAR '\\' -# define DENG_DIR_SEP_STR "\\" -# define DENG_DIR_WRONG_SEP_CHAR '/' +# define DE_DIR_SEP_CHAR '\\' +# define DE_DIR_SEP_STR "\\" +# define DE_DIR_WRONG_SEP_CHAR '/' #else -# define DENG_DIR_SEP_CHAR '/' -# define DENG_DIR_SEP_STR "/" -# define DENG_DIR_WRONG_SEP_CHAR '\\' +# define DE_DIR_SEP_CHAR '/' +# define DE_DIR_SEP_STR "/" +# define DE_DIR_WRONG_SEP_CHAR '\\' #endif #ifdef __cplusplus @@ -97,10 +97,10 @@ class LIBDOOMSDAY_PUBLIC FS1 { public: /// No files found. @ingroup errors - DENG2_ERROR(NotFoundError); + DE_ERROR(NotFoundError); /// An unknown scheme was referenced. @ingroup errors - DENG2_ERROR(UnknownSchemeError); + DE_ERROR(UnknownSchemeError); /** * (Search) path groupings in descending priority. @@ -250,7 +250,7 @@ class LIBDOOMSDAY_PUBLIC FS1 */ bool mapPath(String &path) const; -#ifdef DENG_DEBUG +#ifdef DE_DEBUG void debugPrint() const; #endif @@ -331,7 +331,7 @@ class LIBDOOMSDAY_PUBLIC FS1 */ inline void resetAllSchemes() { Schemes schemes = allSchemes(); - DENG2_FOR_EACH(Schemes, i, schemes){ (*i)->reset(); } + DE_FOR_EACH(Schemes, i, schemes){ (*i)->reset(); } } /** @@ -575,7 +575,7 @@ class LIBDOOMSDAY_PUBLIC FS1 int unloadAllNonStartupFiles(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; Q_DECLARE_OPERATORS_FOR_FLAGS(FS1::Scheme::Flags) @@ -599,4 +599,4 @@ LIBDOOMSDAY_PUBLIC void F_Shutdown(); LIBDOOMSDAY_PUBLIC void const *F_LumpIndex(); #endif // __cplusplus -#endif /* LIBDENG_FILESYS_MAIN_H */ +#endif /* DE_FILESYS_MAIN_H */ diff --git a/doomsday/apps/libdoomsday/include/doomsday/filesys/fs_util.h b/doomsday/apps/libdoomsday/include/doomsday/filesys/fs_util.h index 5a1223ac61..14232ff93b 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/filesys/fs_util.h +++ b/doomsday/apps/libdoomsday/include/doomsday/filesys/fs_util.h @@ -23,8 +23,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_FILESYS_UTIL_H -#define LIBDENG_FILESYS_UTIL_H +#ifndef DE_FILESYS_UTIL_H +#define DE_FILESYS_UTIL_H #include "../libdoomsday.h" #include "../filesys/file.h" @@ -117,4 +117,4 @@ LIBDOOMSDAY_PUBLIC bool F_DumpNativeFile(de::Block const &data, de::NativePath c #endif -#endif // LIBDENG_FILESYS_UTIL_H +#endif // DE_FILESYS_UTIL_H diff --git a/doomsday/apps/libdoomsday/include/doomsday/filesys/idgameslink.h b/doomsday/apps/libdoomsday/include/doomsday/filesys/idgameslink.h index 6a720380a6..8b3a6b7324 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/filesys/idgameslink.h +++ b/doomsday/apps/libdoomsday/include/doomsday/filesys/idgameslink.h @@ -43,7 +43,7 @@ class IdgamesLink : public de::filesys::WebHostedLink void setFileTree(FileTree *tree) override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // LIBDOOMSDAY_FILESYS_IDGAMESLINK_H diff --git a/doomsday/apps/libdoomsday/include/doomsday/filesys/idgamespackageinfofile.h b/doomsday/apps/libdoomsday/include/doomsday/filesys/idgamespackageinfofile.h index b1b9ef2062..5797f27843 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/filesys/idgamespackageinfofile.h +++ b/doomsday/apps/libdoomsday/include/doomsday/filesys/idgamespackageinfofile.h @@ -45,7 +45,7 @@ class IdgamesPackageInfoFile : public de::File, public de::IDownloadable IIStream const &operator >> (de::IByteArray &bytes) const override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // LIBDOOMSDAY_IDGAMESPACKAGEINFOFILE_H diff --git a/doomsday/apps/libdoomsday/include/doomsday/filesys/lumpcache.h b/doomsday/apps/libdoomsday/include/doomsday/filesys/lumpcache.h index e365fdf78b..fe0854753e 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/filesys/lumpcache.h +++ b/doomsday/apps/libdoomsday/include/doomsday/filesys/lumpcache.h @@ -17,8 +17,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_FILESYS_LUMPCACHE_H -#define LIBDENG_FILESYS_LUMPCACHE_H +#ifndef DE_FILESYS_LUMPCACHE_H +#define DE_FILESYS_LUMPCACHE_H #include "../libdoomsday.h" #include "dd_types.h" @@ -87,4 +87,4 @@ class LIBDOOMSDAY_PUBLIC LumpCache DataCache *_dataCache; ///< The cached data. }; -#endif /* LIBDENG_FILESYS_LUMPCACHE_H */ +#endif /* DE_FILESYS_LUMPCACHE_H */ diff --git a/doomsday/apps/libdoomsday/include/doomsday/filesys/lumpindex.h b/doomsday/apps/libdoomsday/include/doomsday/filesys/lumpindex.h index 2ed5f31355..8d5eedae67 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/filesys/lumpindex.h +++ b/doomsday/apps/libdoomsday/include/doomsday/filesys/lumpindex.h @@ -20,8 +20,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_FILESYS_LUMPINDEX_H -#define LIBDENG_FILESYS_LUMPINDEX_H +#ifndef DE_FILESYS_LUMPINDEX_H +#define DE_FILESYS_LUMPINDEX_H #ifdef __cplusplus @@ -45,7 +45,7 @@ class LIBDOOMSDAY_PUBLIC LumpIndex { public: /// No file(s) found. @ingroup errors - DENG2_ERROR(NotFoundError); + DE_ERROR(NotFoundError); typedef QList Lumps; typedef std::list FoundIndices; @@ -149,7 +149,7 @@ class LIBDOOMSDAY_PUBLIC LumpIndex static dsize elementSizeForDataType(Format mapFormat, DataType dataType); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; public: @@ -295,7 +295,7 @@ class LIBDOOMSDAY_PUBLIC LumpIndex static de::Uri composeResourceUrn(lumpnum_t lumpNum); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; typedef LumpIndex::Id1MapRecognizer Id1MapRecognizer; @@ -303,4 +303,4 @@ typedef LumpIndex::Id1MapRecognizer Id1MapRecognizer; } // namespace de #endif // __cplusplus -#endif // LIBDENG_FILESYS_LUMPINDEX_H +#endif // DE_FILESYS_LUMPINDEX_H diff --git a/doomsday/apps/libdoomsday/include/doomsday/filesys/readfile.h b/doomsday/apps/libdoomsday/include/doomsday/filesys/readfile.h index 0fabcb66c9..2f6dcdd0f2 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/filesys/readfile.h +++ b/doomsday/apps/libdoomsday/include/doomsday/filesys/readfile.h @@ -29,9 +29,9 @@ extern "C" { /** * Read a file into a buffer allocated using M_Malloc(). */ -DENG_PUBLIC size_t M_ReadFile(char const *name, char **buffer); +DE_PUBLIC size_t M_ReadFile(char const *name, char **buffer); -DENG_PUBLIC AutoStr *M_ReadFileIntoString(ddstring_t const *path, dd_bool *isCustom); +DE_PUBLIC AutoStr *M_ReadFileIntoString(ddstring_t const *path, dd_bool *isCustom); #ifdef __cplusplus } // extern "C" diff --git a/doomsday/apps/libdoomsday/include/doomsday/filesys/searchpath.h b/doomsday/apps/libdoomsday/include/doomsday/filesys/searchpath.h index 7161c8009b..3137c1ac57 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/filesys/searchpath.h +++ b/doomsday/apps/libdoomsday/include/doomsday/filesys/searchpath.h @@ -20,8 +20,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_FILESYS_SEARCHPATH_H -#define LIBDENG_FILESYS_SEARCHPATH_H +#ifndef DE_FILESYS_SEARCHPATH_H +#define DE_FILESYS_SEARCHPATH_H #ifdef __cplusplus @@ -115,4 +115,4 @@ namespace std { #endif // __cplusplus -#endif /* LIBDENG_FILESYS_SEARCHPATH_H */ +#endif /* DE_FILESYS_SEARCHPATH_H */ diff --git a/doomsday/apps/libdoomsday/include/doomsday/filesys/virtualmappings.h b/doomsday/apps/libdoomsday/include/doomsday/filesys/virtualmappings.h index 45e094caa5..4ce7127ec4 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/filesys/virtualmappings.h +++ b/doomsday/apps/libdoomsday/include/doomsday/filesys/virtualmappings.h @@ -25,12 +25,12 @@ * (Re-)Initialize the VFS path mappings. Checks the -vdmap command line * options. */ -DENG_EXTERN_C LIBDOOMSDAY_PUBLIC void FS_InitVirtualPathMappings(); +DE_EXTERN_C LIBDOOMSDAY_PUBLIC void FS_InitVirtualPathMappings(); /** * (Re-)Initialize the virtual path => WAD lump mappings. * @note Should be called after WADs have been processed. */ -DENG_EXTERN_C LIBDOOMSDAY_PUBLIC void FS_InitPathLumpMappings(); +DE_EXTERN_C LIBDOOMSDAY_PUBLIC void FS_InitPathLumpMappings(); #endif // LIBDOOMSDAY_FILESYS_VIRTUALMAPPINGS_H diff --git a/doomsday/apps/libdoomsday/include/doomsday/filesys/wad.h b/doomsday/apps/libdoomsday/include/doomsday/filesys/wad.h index cf192096de..4fbf09a722 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/filesys/wad.h +++ b/doomsday/apps/libdoomsday/include/doomsday/filesys/wad.h @@ -45,7 +45,7 @@ class LIBDOOMSDAY_PUBLIC Wad : public File1, public LumpIndex public: /// Base class for format-related errors. @ingroup errors - DENG2_ERROR(FormatError); + DE_ERROR(FormatError); /** * File system object for a lump in the WAD. @@ -241,7 +241,7 @@ class LIBDOOMSDAY_PUBLIC Wad : public File1, public LumpIndex LumpTree const &lumpTree() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace de diff --git a/doomsday/apps/libdoomsday/include/doomsday/filesys/zip.h b/doomsday/apps/libdoomsday/include/doomsday/filesys/zip.h index cf1622518f..178c384509 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/filesys/zip.h +++ b/doomsday/apps/libdoomsday/include/doomsday/filesys/zip.h @@ -47,7 +47,7 @@ class LIBDOOMSDAY_PUBLIC Zip : public File1, public LumpIndex public: /// Base class for format-related errors. @ingroup errors - DENG2_ERROR(FormatError); + DE_ERROR(FormatError); /** * File system object for a lump in the ZIP. @@ -294,7 +294,7 @@ class LIBDOOMSDAY_PUBLIC Zip : public File1, public LumpIndex LumpTree const &lumpTree() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace de diff --git a/doomsday/apps/libdoomsday/include/doomsday/game.h b/doomsday/apps/libdoomsday/include/doomsday/game.h index 0e28bbb35a..556ba78ef1 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/game.h +++ b/doomsday/apps/libdoomsday/include/doomsday/game.h @@ -299,7 +299,7 @@ class LIBDOOMSDAY_PUBLIC Game : public de::IObject static void setLocalMultiplayerPackages(de::String const &gameId, de::StringList packages); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; typedef Game::Manifests GameManifests; @@ -312,7 +312,7 @@ class LIBDOOMSDAY_PUBLIC NullGame : public Game { public: /// General exception for invalid action on a NULL object. @ingroup errors - DENG2_ERROR(NullObjectError); + DE_ERROR(NullObjectError); public: NullGame(); diff --git a/doomsday/apps/libdoomsday/include/doomsday/gameprofiles.h b/doomsday/apps/libdoomsday/include/doomsday/gameprofiles.h index 435cc7e260..765d082821 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/gameprofiles.h +++ b/doomsday/apps/libdoomsday/include/doomsday/gameprofiles.h @@ -106,7 +106,7 @@ class LIBDOOMSDAY_PUBLIC GameProfiles : public de::Profiles const de::Record &objectNamespace() const override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; public: @@ -143,7 +143,7 @@ class LIBDOOMSDAY_PUBLIC GameProfiles : public de::Profiles AbstractProfile *profileFromInfoBlock(de::Info::BlockElement const &block); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; typedef GameProfiles::Profile GameProfile; diff --git a/doomsday/apps/libdoomsday/include/doomsday/games.h b/doomsday/apps/libdoomsday/include/doomsday/games.h index 84e099d83d..9ff425a75c 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/games.h +++ b/doomsday/apps/libdoomsday/include/doomsday/games.h @@ -39,7 +39,7 @@ class LIBDOOMSDAY_PUBLIC Games { public: /// The requested game does not exist in the collection. @ingroup errors - DENG2_ERROR(NotFoundError); + DE_ERROR(NotFoundError); /// Used for returning the result of game searches. @see findAll() struct GameListItem @@ -59,13 +59,13 @@ class LIBDOOMSDAY_PUBLIC Games typedef QList All; /// Notified when a new game is added. - DENG2_DEFINE_AUDIENCE2(Addition, void gameAdded(Game &game)) + DE_DEFINE_AUDIENCE2(Addition, void gameAdded(Game &game)) /// Notified after game resources have been located. - DENG2_DEFINE_AUDIENCE2(Readiness, void gameReadinessUpdated()) + DE_DEFINE_AUDIENCE2(Readiness, void gameReadinessUpdated()) /// Notified when a worker task is progressing. - DENG2_DEFINE_AUDIENCE2(Progress, void gameWorkerProgress(int progress)) + DE_DEFINE_AUDIENCE2(Progress, void gameWorkerProgress(int progress)) static Games &get(); @@ -156,7 +156,7 @@ class LIBDOOMSDAY_PUBLIC Games static void consoleRegister(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // LIBDOOMSDAY_GAMES_H diff --git a/doomsday/apps/libdoomsday/include/doomsday/gamestatefolder.h b/doomsday/apps/libdoomsday/include/doomsday/gamestatefolder.h index 04af9b28a3..c80c08f9ca 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/gamestatefolder.h +++ b/doomsday/apps/libdoomsday/include/doomsday/gamestatefolder.h @@ -42,7 +42,7 @@ class LIBDOOMSDAY_PUBLIC GameStateFolder : public de::ArchiveFolder { public: /// Notified whenever the cached metadata of the saved session changes. - DENG2_DEFINE_AUDIENCE2(MetadataChange, void gameStateFolderMetadataChanged(GameStateFolder &session)) + DE_DEFINE_AUDIENCE2(MetadataChange, void gameStateFolderMetadataChanged(GameStateFolder &session)) /** * Session metadata. @@ -74,7 +74,7 @@ class LIBDOOMSDAY_PUBLIC GameStateFolder : public de::ArchiveFolder { public: /// Base class for read errors. @ingroup errors - DENG2_ERROR(ReadError); + DE_ERROR(ReadError); public: /** @@ -103,7 +103,7 @@ class LIBDOOMSDAY_PUBLIC GameStateFolder : public de::ArchiveFolder virtual void read(de::String const &mapUriStr) = 0; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; /** @@ -216,7 +216,7 @@ class LIBDOOMSDAY_PUBLIC GameStateFolder : public de::ArchiveFolder }; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; typedef GameStateFolder::Metadata GameStateMetadata; diff --git a/doomsday/apps/libdoomsday/include/doomsday/player.h b/doomsday/apps/libdoomsday/include/doomsday/player.h index 5dc865c731..c9378f8e56 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/player.h +++ b/doomsday/apps/libdoomsday/include/doomsday/player.h @@ -162,10 +162,10 @@ class LIBDOOMSDAY_PUBLIC Player */ virtual void tick(timespan_t elapsed); - DENG2_CAST_METHODS() + DE_CAST_METHODS() private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // __cplusplus diff --git a/doomsday/apps/libdoomsday/include/doomsday/players.h b/doomsday/apps/libdoomsday/include/doomsday/players.h index d9bc4b63f4..2251cea731 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/players.h +++ b/doomsday/apps/libdoomsday/include/doomsday/players.h @@ -73,7 +73,7 @@ class LIBDOOMSDAY_PUBLIC Players int indexOf(ddplayer_s const *publicData) const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // __cplusplus diff --git a/doomsday/apps/libdoomsday/include/doomsday/plugins.h b/doomsday/apps/libdoomsday/include/doomsday/plugins.h index 072661099c..bdf46d44bf 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/plugins.h +++ b/doomsday/apps/libdoomsday/include/doomsday/plugins.h @@ -249,10 +249,10 @@ struct GameExports class LIBDOOMSDAY_PUBLIC Plugins { public: - DENG2_DEFINE_AUDIENCE2(PublishAPI, void publishAPIToPlugin(Library *)) - DENG2_DEFINE_AUDIENCE2(Notification, void pluginSentNotification(int id, void *data)) + DE_DEFINE_AUDIENCE2(PublishAPI, void publishAPIToPlugin(Library *)) + DE_DEFINE_AUDIENCE2(Notification, void pluginSentNotification(int id, void *data)) - DENG2_ERROR(EntryPointError); + DE_ERROR(EntryPointError); public: Plugins(); @@ -382,7 +382,7 @@ class LIBDOOMSDAY_PUBLIC Plugins int callAllHooks(HookType type, int parm = 0, void *data = nullptr); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // __cplusplus diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/animgroup.h b/doomsday/apps/libdoomsday/include/doomsday/resource/animgroup.h index 8b1b2a780a..c665bb7882 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/animgroup.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/animgroup.h @@ -132,7 +132,7 @@ class LIBDOOMSDAY_PUBLIC AnimGroup Frames const &allFrames() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; typedef AnimGroup::Frame AnimGroupFrame; diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/animgroups.h b/doomsday/apps/libdoomsday/include/doomsday/resource/animgroups.h index 745e9ef23e..0c76ad2a77 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/animgroups.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/animgroups.h @@ -62,7 +62,7 @@ class LIBDOOMSDAY_PUBLIC AnimGroups AnimGroup *animGroupForTexture(TextureManifest const &textureManifest); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace res diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/bundles.h b/doomsday/apps/libdoomsday/include/doomsday/resource/bundles.h index 426d182f8a..ae0aaad802 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/bundles.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/bundles.h @@ -41,9 +41,9 @@ class LIBDOOMSDAY_PUBLIC Bundles typedef QList BlockElements; /// Notified when a data bundle refresh/identification has been completed. - DENG2_DEFINE_AUDIENCE2(Identify, void dataBundlesIdentified()) + DE_DEFINE_AUDIENCE2(Identify, void dataBundlesIdentified()) - DENG2_ERROR(InvalidError); + DE_ERROR(InvalidError); struct LIBDOOMSDAY_PUBLIC MatchResult { @@ -104,7 +104,7 @@ class LIBDOOMSDAY_PUBLIC Bundles MatchResult match(DataBundle const &bundle) const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace res diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/colorpalette.h b/doomsday/apps/libdoomsday/include/doomsday/resource/colorpalette.h index 6341208701..ba78f735ef 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/colorpalette.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/colorpalette.h @@ -39,7 +39,7 @@ class LIBDOOMSDAY_PUBLIC ColorTableReader { public: /// Base class for color-format-related errors. @ingroup errors - DENG2_ERROR(FormatError); + DE_ERROR(FormatError); public: /** @@ -66,10 +66,10 @@ class LIBDOOMSDAY_PUBLIC ColorPalette { public: /// An invalid translation id was specified. @ingroup errors - DENG2_ERROR(InvalidTranslationIdError); + DE_ERROR(InvalidTranslationIdError); /// Notified whenever the color table changes. - DENG2_DEFINE_AUDIENCE(ColorTableChange, void colorPaletteColorTableChanged(ColorPalette &colorPalette)) + DE_DEFINE_AUDIENCE(ColorTableChange, void colorPaletteColorTableChanged(ColorPalette &colorPalette)) /// Palette index translation mapping table. typedef QVector Translation; @@ -164,7 +164,7 @@ class LIBDOOMSDAY_PUBLIC ColorPalette void newTranslation(de::String id, Translation const &mappings); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; typedef ColorPalette::Translation ColorPaletteTranslation; diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/colorpalettes.h b/doomsday/apps/libdoomsday/include/doomsday/resource/colorpalettes.h index c3d19f2b30..fa99057533 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/colorpalettes.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/colorpalettes.h @@ -28,7 +28,7 @@ class LIBDOOMSDAY_PUBLIC ColorPalettes { public: /// Notified when a new palette is added to the collection. - DENG2_DEFINE_AUDIENCE2(Addition, void colorPaletteAdded(ColorPalette &)) + DE_DEFINE_AUDIENCE2(Addition, void colorPaletteAdded(ColorPalette &)) public: ColorPalettes(); @@ -86,7 +86,7 @@ class LIBDOOMSDAY_PUBLIC ColorPalettes void setDefaultColorPalette(ColorPalette *newDefaultPalette); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace res diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/composite.h b/doomsday/apps/libdoomsday/include/doomsday/resource/composite.h index 57945c2183..2649c7b9b0 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/composite.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/composite.h @@ -187,7 +187,7 @@ class LIBDOOMSDAY_PUBLIC Composite void setFlags(Flags flagsToChange, de::FlagOp operation = de::SetFlags); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; Q_DECLARE_OPERATORS_FOR_FLAGS(Composite::Flags) diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/databundle.h b/doomsday/apps/libdoomsday/include/doomsday/resource/databundle.h index cea5891130..e1ce67e5e9 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/databundle.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/databundle.h @@ -50,8 +50,8 @@ class LIBDOOMSDAY_PUBLIC DataBundle : public de::IByteArray public: enum Format { Unknown, Pk3, Wad, Iwad, Pwad, Lump, Ded, Dehacked, Collection }; - DENG2_ERROR(FormatError); - DENG2_ERROR(LinkError); + DE_ERROR(FormatError); + DE_ERROR(LinkError); struct LIBDOOMSDAY_PUBLIC Interpreter : public de::filesys::IInterpreter { de::File *interpretFile(de::File *sourceData) const override; @@ -199,7 +199,7 @@ class LIBDOOMSDAY_PUBLIC DataBundle : public de::IByteArray void setFormat(Format format); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // LIBDOOMSDAY_DATABUNDLE_H diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/idtech1flatlib.h b/doomsday/apps/libdoomsday/include/doomsday/resource/idtech1flatlib.h index 708c5e6b84..ccecae3b3d 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/idtech1flatlib.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/idtech1flatlib.h @@ -34,7 +34,7 @@ class IdTech1FlatLib IdTech1Image flatImage(const String &name) const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace res diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/idtech1image.h b/doomsday/apps/libdoomsday/include/doomsday/resource/idtech1image.h index b5d734e0c0..8074f15d3a 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/idtech1image.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/idtech1image.h @@ -79,7 +79,7 @@ class LIBDOOMSDAY_PUBLIC IdTech1Image void setOrigin(const Vec2i &origin); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace res diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/idtech1texturelib.cpp b/doomsday/apps/libdoomsday/include/doomsday/resource/idtech1texturelib.cpp index fd0d1bf3a5..fad6283959 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/idtech1texturelib.cpp +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/idtech1texturelib.cpp @@ -62,7 +62,7 @@ struct PatchIndex { } // namespace wad -DENG2_PIMPL(IdTech1TextureLib) +DE_PIMPL(IdTech1TextureLib) { struct Patch { Vec2i origin; @@ -134,7 +134,7 @@ DENG2_PIMPL(IdTech1TextureLib) /*fromLittleEndian(patch->stepdir), ByteRefArray(palette.data() + COLORMAP_SIZE * fromLittleEndian(patch->colormap), COLORMAP_SIZE)*/); - DENG2_ASSERT(tex.patches[p].patchLump.first); + DE_ASSERT(tex.patches[p].patchLump.first); } textures.insert(textureName, tex); } diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/idtech1texturelib.h b/doomsday/apps/libdoomsday/include/doomsday/resource/idtech1texturelib.h index 427bb3cb04..2bc21c1a17 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/idtech1texturelib.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/idtech1texturelib.h @@ -41,7 +41,7 @@ class LIBDOOMSDAY_PUBLIC IdTech1TextureLib IdTech1Image textureImage(const String &name) const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace res diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/lumpcatalog.h b/doomsday/apps/libdoomsday/include/doomsday/resource/lumpcatalog.h index 9830f97c05..85ad108671 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/lumpcatalog.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/lumpcatalog.h @@ -92,7 +92,7 @@ class LIBDOOMSDAY_PUBLIC LumpCatalog de::StringList packages() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace res diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/lumpdirectory.h b/doomsday/apps/libdoomsday/include/doomsday/resource/lumpdirectory.h index 2b8532b468..0a53eda2e9 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/lumpdirectory.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/lumpdirectory.h @@ -55,7 +55,7 @@ class LIBDOOMSDAY_PUBLIC LumpDirectory typedef Rangez Range; static dsize const InvalidPos; - DENG2_ERROR(OffsetError); + DE_ERROR(OffsetError); public: /** @@ -122,7 +122,7 @@ class LIBDOOMSDAY_PUBLIC LumpDirectory StringList mapsInContiguousRangesAsText() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace res diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/manifest.h b/doomsday/apps/libdoomsday/include/doomsday/resource/manifest.h index bf06cd2735..a021d58730 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/manifest.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/manifest.h @@ -94,7 +94,7 @@ class LIBDOOMSDAY_PUBLIC ResourceManifest de::String const &resolvedPath(bool tryLocate = true); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // LIBDOOMSDAY_RESOURCE_MANIFEST_H diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/mapmanifests.h b/doomsday/apps/libdoomsday/include/doomsday/resource/mapmanifests.h index 25b5ab5ebb..b1700cd32d 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/mapmanifests.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/mapmanifests.h @@ -61,7 +61,7 @@ class LIBDOOMSDAY_PUBLIC MapManifests Tree const &allMapManifests() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace res diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/resourceclass.h b/doomsday/apps/libdoomsday/include/doomsday/resource/resourceclass.h index 5a8c638bd0..a644b36138 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/resourceclass.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/resourceclass.h @@ -105,7 +105,7 @@ class LIBDOOMSDAY_PUBLIC ResourceClass static void setResourceClassCallback(ResourceClass &(*callback)(resourceclassid_t)); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; /** diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/resources.h b/doomsday/apps/libdoomsday/include/doomsday/resource/resources.h index 1e5e09223e..0e676ed427 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/resources.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/resources.h @@ -46,16 +46,16 @@ class LIBDOOMSDAY_PUBLIC Resources : public de::System { public: /// An unknown resource scheme was referenced. @ingroup errors - DENG2_ERROR(UnknownSchemeError); + DE_ERROR(UnknownSchemeError); /// The referenced resource was not found. @ingroup errors - DENG2_ERROR(MissingResourceError); + DE_ERROR(MissingResourceError); /// An unknown resource class identifier was specified. @ingroup errors - DENG2_ERROR(UnknownResourceClassError); + DE_ERROR(UnknownResourceClassError); /// The referenced manifest was not found. @ingroup errors - DENG2_ERROR(MissingResourceManifestError); + DE_ERROR(MissingResourceManifestError); static Resources &get(); @@ -128,7 +128,7 @@ class LIBDOOMSDAY_PUBLIC Resources : public de::System static void consoleRegister(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; namespace res diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/sprites.h b/doomsday/apps/libdoomsday/include/doomsday/resource/sprites.h index de8a765e7b..0f9f9a719a 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/sprites.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/sprites.h @@ -83,7 +83,7 @@ class LIBDOOMSDAY_PUBLIC Sprites static bool isValidSpriteName(de::String name); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace res diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/texture.h b/doomsday/apps/libdoomsday/include/doomsday/resource/texture.h index 4cd44a6ce9..eeedd1140d 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/texture.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/texture.h @@ -41,8 +41,8 @@ class TextureManifest; class LIBDOOMSDAY_PUBLIC Texture { public: - DENG2_DEFINE_AUDIENCE(Deletion, void textureBeingDeleted (Texture const &)) - DENG2_DEFINE_AUDIENCE(DimensionsChange, void textureDimensionsChanged (Texture const &)) + DE_DEFINE_AUDIENCE(Deletion, void textureBeingDeleted (Texture const &)) + DE_DEFINE_AUDIENCE(DimensionsChange, void textureDimensionsChanged (Texture const &)) /** * Classification/processing flags. @@ -240,7 +240,7 @@ class LIBDOOMSDAY_PUBLIC Texture static void consoleRegister(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; Q_DECLARE_OPERATORS_FOR_FLAGS(Texture::Flags) diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/texturemanifest.h b/doomsday/apps/libdoomsday/include/doomsday/resource/texturemanifest.h index 8361b39ee2..a8f4874d0a 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/texturemanifest.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/texturemanifest.h @@ -46,14 +46,14 @@ class LIBDOOMSDAY_PUBLIC TextureManifest : public de::PathTree::Node { public: /// Required texture instance is missing. @ingroup errors - DENG2_ERROR(MissingTextureError); + DE_ERROR(MissingTextureError); /// Required resource URI is not defined. @ingroup errors - DENG2_ERROR(MissingResourceUriError); + DE_ERROR(MissingResourceUriError); - DENG2_DEFINE_AUDIENCE(Deletion, void textureManifestBeingDeleted (TextureManifest const &manifest)) - DENG2_DEFINE_AUDIENCE(UniqueIdChange, void textureManifestUniqueIdChanged(TextureManifest &manifest)) - DENG2_DEFINE_AUDIENCE(TextureDerived, void textureManifestTextureDerived (TextureManifest &manifest, Texture &texture)) + DE_DEFINE_AUDIENCE(Deletion, void textureManifestBeingDeleted (TextureManifest const &manifest)) + DE_DEFINE_AUDIENCE(UniqueIdChange, void textureManifestUniqueIdChanged(TextureManifest &manifest)) + DE_DEFINE_AUDIENCE(TextureDerived, void textureManifestTextureDerived (TextureManifest &manifest, Texture &texture)) typedef std::function TextureConstructor; @@ -228,7 +228,7 @@ class LIBDOOMSDAY_PUBLIC TextureManifest : public de::PathTree::Node inline void clearTexture() { setTexture(nullptr); } private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace res diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/textures.h b/doomsday/apps/libdoomsday/include/doomsday/resource/textures.h index b1c326d105..f6b16b82a5 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/textures.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/textures.h @@ -229,7 +229,7 @@ class LIBDOOMSDAY_PUBLIC Textures patchid_t declarePatch(de::String const &encodedName); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace res diff --git a/doomsday/apps/libdoomsday/include/doomsday/resource/texturescheme.h b/doomsday/apps/libdoomsday/include/doomsday/resource/texturescheme.h index 3a65db906a..c4ec808ed4 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/resource/texturescheme.h +++ b/doomsday/apps/libdoomsday/include/doomsday/resource/texturescheme.h @@ -41,15 +41,15 @@ class LIBDOOMSDAY_PUBLIC TextureScheme public: /// The requested manifest could not be found in the index. - DENG2_ERROR(NotFoundError); + DE_ERROR(NotFoundError); /// The specified path was not valid. @ingroup errors - DENG2_ERROR(InvalidPathError); + DE_ERROR(InvalidPathError); - DENG2_DEFINE_AUDIENCE(ManifestDefined, void textureSchemeManifestDefined(TextureScheme &scheme, Manifest &manifest)) + DE_DEFINE_AUDIENCE(ManifestDefined, void textureSchemeManifestDefined(TextureScheme &scheme, Manifest &manifest)) /// Minimum length of a symbolic name. - static int const min_name_length = DENG2_URI_MIN_SCHEME_LENGTH; + static int const min_name_length = DE_URI_MIN_SCHEME_LENGTH; /// Manifests in the scheme are placed into a tree. typedef de::PathTreeT Index; @@ -141,7 +141,7 @@ class LIBDOOMSDAY_PUBLIC TextureScheme Index const &index() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace res diff --git a/doomsday/apps/libdoomsday/include/doomsday/savegames.h b/doomsday/apps/libdoomsday/include/doomsday/savegames.h index 3fd2c95eeb..63cb315b6e 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/savegames.h +++ b/doomsday/apps/libdoomsday/include/doomsday/savegames.h @@ -57,7 +57,7 @@ class LIBDOOMSDAY_PUBLIC SaveGames static de::String savePath(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // LIBDOOMSDAY_SAVEGAMES_H diff --git a/doomsday/apps/libdoomsday/include/doomsday/uri.h b/doomsday/apps/libdoomsday/include/doomsday/uri.h index 296cc54762..23d533f408 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/uri.h +++ b/doomsday/apps/libdoomsday/include/doomsday/uri.h @@ -28,7 +28,7 @@ #include "resource/resourceclass.h" /// Schemes must be at least this many characters. -#define DENG2_URI_MIN_SCHEME_LENGTH 2 +#define DE_URI_MIN_SCHEME_LENGTH 2 #include #include @@ -54,13 +54,13 @@ class LIBDOOMSDAY_PUBLIC Uri : public ISerializable { public: /// Base class for resolve-related errors. @ingroup errors - DENG2_ERROR(ResolveError); + DE_ERROR(ResolveError); /// An unknown symbol was encountered in the embedded expression. @ingroup errors - DENG2_SUB_ERROR(ResolveError, UnknownSymbolError); + DE_SUB_ERROR(ResolveError, UnknownSymbolError); /// An unresolveable symbol was encountered in the embedded expression. @ingroup errors - DENG2_SUB_ERROR(ResolveError, ResolveSymbolError); + DE_SUB_ERROR(ResolveError, ResolveSymbolError); /** * Flags determining the composition of textual representation: @@ -341,7 +341,7 @@ class LIBDOOMSDAY_PUBLIC Uri : public ISerializable static void setResolverFunc(ResolverFunc resolver); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; Q_DECLARE_OPERATORS_FOR_FLAGS(Uri::ComposeAsTextFlags) diff --git a/doomsday/apps/libdoomsday/include/doomsday/world/bspnode.h b/doomsday/apps/libdoomsday/include/doomsday/world/bspnode.h index 527839c6d2..6d18a15449 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/world/bspnode.h +++ b/doomsday/apps/libdoomsday/include/doomsday/world/bspnode.h @@ -33,7 +33,7 @@ class LIBDOOMSDAY_PUBLIC BspElement { public: virtual ~BspElement() {} - DENG2_CAST_METHODS() + DE_CAST_METHODS() }; /** diff --git a/doomsday/apps/libdoomsday/include/doomsday/world/entitydatabase.h b/doomsday/apps/libdoomsday/include/doomsday/world/entitydatabase.h index 4eca2842db..ab5a9f525a 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/world/entitydatabase.h +++ b/doomsday/apps/libdoomsday/include/doomsday/world/entitydatabase.h @@ -84,7 +84,7 @@ class LIBDOOMSDAY_PUBLIC EntityDatabase } private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // LIBDOOMSDAY_WORLD_ENTITYDATABASE_H diff --git a/doomsday/apps/libdoomsday/include/doomsday/world/map.h b/doomsday/apps/libdoomsday/include/doomsday/world/map.h index cf51408fe1..e2446e1b01 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/world/map.h +++ b/doomsday/apps/libdoomsday/include/doomsday/world/map.h @@ -39,10 +39,10 @@ class LIBDOOMSDAY_PUBLIC BaseMap { public: /// No resource manifest is associated with the map. @ingroup errors - DENG2_ERROR(MissingResourceManifestError); + DE_ERROR(MissingResourceManifestError); /// Required map object is missing. @ingroup errors - DENG2_ERROR(MissingObjectError); + DE_ERROR(MissingObjectError); public: /** @@ -83,14 +83,14 @@ class LIBDOOMSDAY_PUBLIC BaseMap virtual void deserializeInternalState(de::Reader &from, IThinkerMapping const &); - DENG2_CAST_METHODS() + DE_CAST_METHODS() public: /// Notified when the map is about to be deleted. - DENG2_DEFINE_AUDIENCE2(Deletion, void mapBeingDeleted(BaseMap const &map)) + DE_DEFINE_AUDIENCE2(Deletion, void mapBeingDeleted(BaseMap const &map)) private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; typedef de::duint16 InternalSerialId; diff --git a/doomsday/apps/libdoomsday/include/doomsday/world/mapelement.h b/doomsday/apps/libdoomsday/include/doomsday/world/mapelement.h index 82ec258e19..ca240b003d 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/world/mapelement.h +++ b/doomsday/apps/libdoomsday/include/doomsday/world/mapelement.h @@ -40,21 +40,21 @@ class Map; */ class LIBDOOMSDAY_PUBLIC MapElement { - DENG2_NO_COPY (MapElement) - DENG2_NO_ASSIGN(MapElement) + DE_NO_COPY (MapElement) + DE_NO_ASSIGN(MapElement) public: /// Attempted to configure an invalid parent element. @ingroup errors - DENG2_ERROR(InvalidParentError); + DE_ERROR(InvalidParentError); /// No map is attributed. @ingroup errors - DENG2_ERROR(MissingMapError); + DE_ERROR(MissingMapError); /// The referenced property does not exist. @ingroup errors - DENG2_ERROR(UnknownPropertyError); + DE_ERROR(UnknownPropertyError); /// The referenced property is not writeable. @ingroup errors - DENG2_ERROR(WritePropertyError); + DE_ERROR(WritePropertyError); /// Special identifier used to mark an invalid index. enum { NoIndex = -1 }; @@ -75,7 +75,7 @@ class LIBDOOMSDAY_PUBLIC MapElement */ de::dint type() const; - DENG2_CAST_METHODS() + DE_CAST_METHODS() /** * Returns @c true iff a parent is attributed to the map element. @@ -90,12 +90,12 @@ class LIBDOOMSDAY_PUBLIC MapElement * @see hasParent(), setParent() */ inline MapElement &parent() { - DENG2_ASSERT(_parent); + DE_ASSERT(_parent); return *_parent; } inline MapElement const &parent() const { - DENG2_ASSERT(_parent); + DE_ASSERT(_parent); return *_parent; } @@ -200,7 +200,7 @@ class LIBDOOMSDAY_PUBLIC MapElement virtual de::dint setProperty(world::DmuArgs const &args); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) MapElement *_parent = nullptr; }; diff --git a/doomsday/apps/libdoomsday/include/doomsday/world/material.h b/doomsday/apps/libdoomsday/include/doomsday/world/material.h index 4c8e0801a0..51c83e8e40 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/world/material.h +++ b/doomsday/apps/libdoomsday/include/doomsday/world/material.h @@ -48,10 +48,10 @@ class LIBDOOMSDAY_PUBLIC Material : public MapElement { public: /// Notified when the material is about to be deleted. - DENG2_DEFINE_AUDIENCE2(Deletion, void materialBeingDeleted(Material const &)) + DE_DEFINE_AUDIENCE2(Deletion, void materialBeingDeleted(Material const &)) /// Notified whenever the logical dimensions change. - DENG2_DEFINE_AUDIENCE2(DimensionsChange, void materialDimensionsChanged(Material &)) + DE_DEFINE_AUDIENCE2(DimensionsChange, void materialDimensionsChanged(Material &)) public: /** @@ -141,7 +141,7 @@ class LIBDOOMSDAY_PUBLIC Material : public MapElement //- Layers ------------------------------------------------------------------------------ /// The referenced layer does not exist. @ingroup errors - //DENG2_ERROR(MissingLayerError); + //DE_ERROR(MissingLayerError); /** * Base class for modelling a logical layer. @@ -158,7 +158,7 @@ class LIBDOOMSDAY_PUBLIC Material : public MapElement { public: /// The referenced stage does not exist. @ingroup errors - DENG2_ERROR(MissingStageError); + DE_ERROR(MissingStageError); /** * Base class for a logical layer animation stage. @@ -172,7 +172,7 @@ class LIBDOOMSDAY_PUBLIC Material : public MapElement Stage(Stage const &other) : tics(other.tics), variance(other.variance) {} virtual ~Stage() {} - DENG2_CAST_METHODS() + DE_CAST_METHODS() /** * Returns a human-friendly, textual description of the animation stage @@ -184,7 +184,7 @@ class LIBDOOMSDAY_PUBLIC Material : public MapElement public: virtual ~Layer(); - DENG2_CAST_METHODS() + DE_CAST_METHODS() /** * Returns a human-friendly, textual name for the type of material layer. @@ -244,7 +244,7 @@ class LIBDOOMSDAY_PUBLIC Material : public MapElement * Lookup a Layer by it's unique @a index. */ inline Layer &layer(int index) const { - DENG2_ASSERT(index >= 0 && index < layerCount()); + DE_ASSERT(index >= 0 && index < layerCount()); return *_layers[index]; } @@ -285,7 +285,7 @@ class LIBDOOMSDAY_PUBLIC Material : public MapElement QVector _layers; Flags _flags = DefaultFlags; - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; Q_DECLARE_OPERATORS_FOR_FLAGS(Material::Flags) diff --git a/doomsday/apps/libdoomsday/include/doomsday/world/materialarchive.h b/doomsday/apps/libdoomsday/include/doomsday/world/materialarchive.h index b0f5dd8c01..9eaa60df43 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/world/materialarchive.h +++ b/doomsday/apps/libdoomsday/include/doomsday/world/materialarchive.h @@ -42,7 +42,7 @@ class LIBDOOMSDAY_PUBLIC MaterialArchive { public: /// Base class for all deserialization errors. @ingroup errors - DENG2_ERROR(ReadError); + DE_ERROR(ReadError); public: /** @@ -108,7 +108,7 @@ class LIBDOOMSDAY_PUBLIC MaterialArchive void read(reader_s &reader, int forcedVersion = -1); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace world diff --git a/doomsday/apps/libdoomsday/include/doomsday/world/materialmanifest.h b/doomsday/apps/libdoomsday/include/doomsday/world/materialmanifest.h index 94f1be4a3c..95450cb4d1 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/world/materialmanifest.h +++ b/doomsday/apps/libdoomsday/include/doomsday/world/materialmanifest.h @@ -45,10 +45,10 @@ class LIBDOOMSDAY_PUBLIC MaterialManifest : public de::PathTree::Node { public: /// Required material instance is missing. @ingroup errors - DENG2_ERROR(MissingMaterialError); + DE_ERROR(MissingMaterialError); - DENG2_DEFINE_AUDIENCE(Deletion, void materialManifestBeingDeleted (MaterialManifest const &manifest)) - DENG2_DEFINE_AUDIENCE(MaterialDerived, void materialManifestMaterialDerived(MaterialManifest &manifest, Material &material)) + DE_DEFINE_AUDIENCE(Deletion, void materialManifestBeingDeleted (MaterialManifest const &manifest)) + DE_DEFINE_AUDIENCE(MaterialDerived, void materialManifestMaterialDerived(MaterialManifest &manifest, Material &material)) enum Flag { @@ -167,7 +167,7 @@ class LIBDOOMSDAY_PUBLIC MaterialManifest : public de::PathTree::Node static void setMaterialConstructor(MaterialConstructor func); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; Q_DECLARE_OPERATORS_FOR_FLAGS(MaterialManifest::Flags) diff --git a/doomsday/apps/libdoomsday/include/doomsday/world/materials.h b/doomsday/apps/libdoomsday/include/doomsday/world/materials.h index 329d2d232c..26a23b2e36 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/world/materials.h +++ b/doomsday/apps/libdoomsday/include/doomsday/world/materials.h @@ -33,10 +33,10 @@ class LIBDOOMSDAY_PUBLIC Materials { public: /// An unknown material group was referenced. @ingroup errors - DENG2_ERROR(UnknownMaterialGroupError); + DE_ERROR(UnknownMaterialGroupError); /// The specified material id was invalid (out of range). @ingroup errors - DENG2_ERROR(UnknownMaterialIdError); + DE_ERROR(UnknownMaterialIdError); typedef QSet MaterialManifestGroup; typedef QList MaterialManifestGroups; @@ -200,7 +200,7 @@ class LIBDOOMSDAY_PUBLIC Materials void updateLookup(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace world diff --git a/doomsday/apps/libdoomsday/include/doomsday/world/materialscheme.h b/doomsday/apps/libdoomsday/include/doomsday/world/materialscheme.h index 2d3dd18615..4ad27328e1 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/world/materialscheme.h +++ b/doomsday/apps/libdoomsday/include/doomsday/world/materialscheme.h @@ -40,15 +40,15 @@ class LIBDOOMSDAY_PUBLIC MaterialScheme public: /// The requested manifest could not be found in the index. @ingroup errors - DENG2_ERROR(NotFoundError); + DE_ERROR(NotFoundError); /// The specified path was not valid. @ingroup errors - DENG2_ERROR(InvalidPathError); + DE_ERROR(InvalidPathError); - DENG2_DEFINE_AUDIENCE(ManifestDefined, void materialSchemeManifestDefined(MaterialScheme &scheme, Manifest &manifest)) + DE_DEFINE_AUDIENCE(ManifestDefined, void materialSchemeManifestDefined(MaterialScheme &scheme, Manifest &manifest)) /// Minimum length of a symbolic name. - static int const min_name_length = DENG2_URI_MIN_SCHEME_LENGTH; + static int const min_name_length = DE_URI_MIN_SCHEME_LENGTH; /// Manifests in the scheme are placed into a tree. typedef de::PathTreeT Index; @@ -110,7 +110,7 @@ class LIBDOOMSDAY_PUBLIC MaterialScheme Index const &index() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace world diff --git a/doomsday/apps/libdoomsday/include/doomsday/world/mobjthinkerdata.h b/doomsday/apps/libdoomsday/include/doomsday/world/mobjthinkerdata.h index aa325b0b13..df86e2aebe 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/world/mobjthinkerdata.h +++ b/doomsday/apps/libdoomsday/include/doomsday/world/mobjthinkerdata.h @@ -62,7 +62,7 @@ class LIBDOOMSDAY_PUBLIC MobjThinkerData : public ThinkerData void operator << (de::Reader &from) override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // LIBDOOMSDAY_MOBJTHINKERDATA_H diff --git a/doomsday/apps/libdoomsday/include/doomsday/world/thinker.h b/doomsday/apps/libdoomsday/include/doomsday/world/thinker.h index e3f2596eb1..23c66de919 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/world/thinker.h +++ b/doomsday/apps/libdoomsday/include/doomsday/world/thinker.h @@ -127,7 +127,7 @@ class LIBDOOMSDAY_PUBLIC Thinker virtual void think() = 0; virtual IData *duplicate() const = 0; - DENG2_CAST_METHODS() + DE_CAST_METHODS() }; enum AllocMethod { AllocateStandard, AllocateMemoryZone }; @@ -225,7 +225,7 @@ class LIBDOOMSDAY_PUBLIC Thinker static void zap(thinker_s &thinkerBase, de::dsize sizeInBytes); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) public: // Value accessors (POD thinker_s compatibility for old code; TODO: remove in the future): diff --git a/doomsday/apps/libdoomsday/include/doomsday/world/thinkerdata.h b/doomsday/apps/libdoomsday/include/doomsday/world/thinkerdata.h index 19ce5bd48b..eabb41488b 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/world/thinkerdata.h +++ b/doomsday/apps/libdoomsday/include/doomsday/world/thinkerdata.h @@ -39,7 +39,7 @@ class LIBDOOMSDAY_PUBLIC ThinkerData , public de::Deletable { public: - DENG2_DEFINE_AUDIENCE2(Deletion, void thinkerBeingDeleted(thinker_s &)) + DE_DEFINE_AUDIENCE2(Deletion, void thinkerBeingDeleted(thinker_s &)) public: ThinkerData(de::Id const &id = de::Id::none()); @@ -93,9 +93,9 @@ class LIBDOOMSDAY_PUBLIC ThinkerData static ThinkerData *find(de::Id const &id); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG public: struct DebugCounter { de::Id id; @@ -107,18 +107,18 @@ class LIBDOOMSDAY_PUBLIC ThinkerData DebugCounter _debugCounter; struct DebugValidator { - DebugValidator() { DENG2_ASSERT(DebugCounter::total == 0); } - ~DebugValidator() { DENG2_ASSERT(DebugCounter::total == 0); } + DebugValidator() { DE_ASSERT(DebugCounter::total == 0); } + ~DebugValidator() { DE_ASSERT(DebugCounter::total == 0); } }; #endif }; -DENG2_SCRIPT_ARGUMENT_TYPE(ThinkerData *, +DE_SCRIPT_ARGUMENT_TYPE(ThinkerData *, if (!arg) return ScriptLex::NONE; return scriptArgumentAsText(arg->objectNamespace()); ) -DENG2_SCRIPT_ARGUMENT_TYPE(ThinkerData const *, +DE_SCRIPT_ARGUMENT_TYPE(ThinkerData const *, if (!arg) return ScriptLex::NONE; return scriptArgumentAsText(arg->objectNamespace()); ) diff --git a/doomsday/apps/libdoomsday/include/doomsday/world/world.h b/doomsday/apps/libdoomsday/include/doomsday/world/world.h index 7ec886eef7..dcc2287c6c 100644 --- a/doomsday/apps/libdoomsday/include/doomsday/world/world.h +++ b/doomsday/apps/libdoomsday/include/doomsday/world/world.h @@ -75,13 +75,13 @@ class LIBDOOMSDAY_PUBLIC World : public de::System public: /// Notified whenever the "current" map changes. - DENG2_DEFINE_AUDIENCE2(MapChange, void worldMapChanged()) + DE_DEFINE_AUDIENCE2(MapChange, void worldMapChanged()) public: /// @todo make private: void notifyMapChange(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // LIBDOOMSDAY_WORLD_H diff --git a/doomsday/apps/libdoomsday/src/abstractsession.cpp b/doomsday/apps/libdoomsday/src/abstractsession.cpp index badee40e05..80b202ecfe 100644 --- a/doomsday/apps/libdoomsday/src/abstractsession.cpp +++ b/doomsday/apps/libdoomsday/src/abstractsession.cpp @@ -31,7 +31,7 @@ using namespace de; //static AbstractSession::Profile currentProfile; -DENG2_PIMPL_NOREF(AbstractSession) +DE_PIMPL_NOREF(AbstractSession) { bool inProgress = false; ///< @c true: session is in progress / internal.save exists. de::Uri mapUri; diff --git a/doomsday/apps/libdoomsday/src/busymode.cpp b/doomsday/apps/libdoomsday/src/busymode.cpp index aafa00ebe0..665b400c40 100644 --- a/doomsday/apps/libdoomsday/src/busymode.cpp +++ b/doomsday/apps/libdoomsday/src/busymode.cpp @@ -31,7 +31,7 @@ using namespace de; -DENG2_PIMPL(BusyMode) +DE_PIMPL(BusyMode) , public Lockable { ITaskRunner *runner = nullptr; @@ -47,10 +47,10 @@ DENG2_PIMPL(BusyMode) int performTask(BusyTask *task) { - DENG2_ASSERT(task); + DE_ASSERT(task); if (!task) return 0; - DENG2_ASSERT(!busyInited); + DE_ASSERT(!busyInited); busyTask = task; busyTaskEndedWithError = false; @@ -86,18 +86,18 @@ DENG2_PIMPL(BusyMode) return result.returnValue; } - DENG2_PIMPL_AUDIENCE(Beginning) - DENG2_PIMPL_AUDIENCE(End) - DENG2_PIMPL_AUDIENCE(Abort) - DENG2_PIMPL_AUDIENCE(TaskWillStart) - DENG2_PIMPL_AUDIENCE(TaskComplete) + DE_PIMPL_AUDIENCE(Beginning) + DE_PIMPL_AUDIENCE(End) + DE_PIMPL_AUDIENCE(Abort) + DE_PIMPL_AUDIENCE(TaskWillStart) + DE_PIMPL_AUDIENCE(TaskComplete) }; -DENG2_AUDIENCE_METHOD(BusyMode, Beginning) -DENG2_AUDIENCE_METHOD(BusyMode, End) -DENG2_AUDIENCE_METHOD(BusyMode, Abort) -DENG2_AUDIENCE_METHOD(BusyMode, TaskWillStart) -DENG2_AUDIENCE_METHOD(BusyMode, TaskComplete) +DE_AUDIENCE_METHOD(BusyMode, Beginning) +DE_AUDIENCE_METHOD(BusyMode, End) +DE_AUDIENCE_METHOD(BusyMode, Abort) +DE_AUDIENCE_METHOD(BusyMode, TaskWillStart) +DE_AUDIENCE_METHOD(BusyMode, TaskComplete) BusyMode::BusyMode() : d(new Impl(this)) {} @@ -124,7 +124,7 @@ bool BusyMode::endedWithError() const BusyTask *BusyMode::currentTask() const { - DENG2_GUARD(d) + DE_GUARD(d) if (!isActive()) return nullptr; return d->busyTask; @@ -132,12 +132,12 @@ BusyTask *BusyMode::currentTask() const void BusyMode::abort(String const &message) { - DENG2_GUARD(d) + DE_GUARD(d) d->busyTaskEndedWithError = true; d->busyError = message; - DENG2_FOR_AUDIENCE2(Abort, i) + DE_FOR_AUDIENCE2(Abort, i) { i->busyModeAborted(message); } @@ -171,7 +171,7 @@ static BusyTask *newTask(int mode, std::function worker, void* wor static void deleteTask(BusyTask *task) { - DENG_ASSERT(task); + DE_ASSERT(task); if (task->name) M_Free((void *)task->name); delete task; } @@ -211,14 +211,14 @@ int BusyMode::runTasks(BusyTask *tasks, int numTasks) int result = 0; Time startedAt; - DENG2_ASSERT(!isActive()); + DE_ASSERT(!isActive()); if (!tasks || numTasks <= 0) return result; // Hmm, no work? // Pick the first task. task = tasks; - DENG2_FOR_AUDIENCE2(Beginning, i) + DE_FOR_AUDIENCE2(Beginning, i) { i->busyModeWillBegin(*task); } @@ -250,7 +250,7 @@ int BusyMode::runTasks(BusyTask *tasks, int numTasks) /** * Process the work. */ - DENG2_FOR_AUDIENCE2(TaskWillStart, i) + DE_FOR_AUDIENCE2(TaskWillStart, i) { i->busyTaskWillStart(*task); } @@ -263,7 +263,7 @@ int BusyMode::runTasks(BusyTask *tasks, int numTasks) deleteTask(tmp); tmp = nullptr; - DENG2_FOR_AUDIENCE2(TaskComplete, i) + DE_FOR_AUDIENCE2(TaskComplete, i) { i->busyTaskCompleted(*task); } @@ -271,7 +271,7 @@ int BusyMode::runTasks(BusyTask *tasks, int numTasks) if (result) break; } - DENG2_FOR_AUDIENCE2(End, i) + DE_FOR_AUDIENCE2(End, i) { i->busyModeEnded(); } diff --git a/doomsday/apps/libdoomsday/src/c_wrapper/library.cpp b/doomsday/apps/libdoomsday/src/c_wrapper/library.cpp index a0f7ab6f3a..c1783b60ff 100644 --- a/doomsday/apps/libdoomsday/src/c_wrapper/library.cpp +++ b/doomsday/apps/libdoomsday/src/c_wrapper/library.cpp @@ -68,7 +68,7 @@ void Library_ReleaseGames() LOGDEV_RES_VERBOSE("Closing '%s'") << Str_Text(lib->path); // Close the Library. - DENG2_ASSERT(lib->file); + DE_ASSERT(lib->file); lib->file->clear(); } } @@ -78,7 +78,7 @@ void Library_ReleaseGames() #ifdef UNIX static void reopenLibraryIfNeeded(Library *lib) { - DENG2_ASSERT(lib); + DE_ASSERT(lib); if (!lib->file->loaded()) { @@ -87,7 +87,7 @@ static void reopenLibraryIfNeeded(Library *lib) // Make sure the Library gets opened again now. lib->file->library(); - DENG2_ASSERT(lib->file->loaded()); + DE_ASSERT(lib->file->loaded()); DoomsdayApp::plugins().publishAPIs(lib); } @@ -149,13 +149,13 @@ void Library_Delete(Library *lib) char const *Library_Type(Library const *lib) { - DENG2_ASSERT(lib); + DE_ASSERT(lib); return &lib->typeId[0]; } de::LibraryFile &Library_File(Library *lib) { - DENG2_ASSERT(lib); + DE_ASSERT(lib); return *lib->file; } @@ -164,7 +164,7 @@ void *Library_Symbol(Library *lib, char const *symbolName) try { LOG_AS("Library_Symbol"); - DENG2_ASSERT(lib); + DE_ASSERT(lib); #ifdef UNIX reopenLibraryIfNeeded(lib); #endif @@ -184,7 +184,7 @@ char const *Library_LastError() de::LoopResult Library_ForAll(std::function func) { - auto const &libs = de::App::fileSystem().indexFor(DENG2_TYPE_NAME(de::LibraryFile)); + auto const &libs = de::App::fileSystem().indexFor(DE_TYPE_NAME(de::LibraryFile)); foreach (de::File *file, libs.files()) { if (file->path().beginsWith("/bin/")) diff --git a/doomsday/apps/libdoomsday/src/console/alias.cpp b/doomsday/apps/libdoomsday/src/console/alias.cpp index 151f9ffb44..908b13a524 100644 --- a/doomsday/apps/libdoomsday/src/console/alias.cpp +++ b/doomsday/apps/libdoomsday/src/console/alias.cpp @@ -127,7 +127,7 @@ calias_t* Con_AddAlias(char const* name, char const* command) void Con_DeleteAlias(calias_t* cal) { - DENG_ASSERT(cal); + DE_ASSERT(cal); uint idx; for (idx = 0; idx < numCAliases; ++idx) diff --git a/doomsday/apps/libdoomsday/src/console/cmd.cpp b/doomsday/apps/libdoomsday/src/console/cmd.cpp index 5d249abdae..ce26f8b716 100644 --- a/doomsday/apps/libdoomsday/src/console/cmd.cpp +++ b/doomsday/apps/libdoomsday/src/console/cmd.cpp @@ -75,12 +75,12 @@ void Con_AddKnownWordsForCommands() void Con_AddCommand(ccmdtemplate_t const* ccmd) { int minArgs, maxArgs; - cvartype_t args[DENG_MAX_ARGS]; + cvartype_t args[DE_MAX_ARGS]; ccmd_t* newCCmd, *overloaded = 0; if (!ccmd) return; - DENG_ASSERT(ccmd->name != 0); + DE_ASSERT(ccmd->name != 0); // Decode the usage string if present. if (ccmd->argTemplate != 0) @@ -125,9 +125,9 @@ void Con_AddCommand(ccmdtemplate_t const* ccmd) if (type != CVT_NULL) { - if (minArgs >= DENG_MAX_ARGS) + if (minArgs >= DE_MAX_ARGS) App_FatalError("Con_AddCommand: CCmd '%s': Too many arguments. " - "Limit is %i.", ccmd->name, DENG_MAX_ARGS); + "Limit is %i.", ccmd->name, DE_MAX_ARGS); args[minArgs++] = type; } @@ -365,7 +365,7 @@ dd_bool Con_IsValidCommand(char const* name) String Con_CmdUsageAsStyledText(ccmd_t const *ccmd) { - DENG2_ASSERT(ccmd != 0); + DE_ASSERT(ccmd != 0); if (ccmd->minArgs == -1 && ccmd->maxArgs == -1) return String(); @@ -407,11 +407,11 @@ String Con_CmdAsStyledText(ccmd_t *cmd) D_CMD(MappedConfigVariable) { - DENG_UNUSED(src); + DE_UNUSED(src); // Look up the variable. auto const found = mappedConfigVariables.constFind(argv[0]); - DENG2_ASSERT(found != mappedConfigVariables.constEnd()); // mapping must be defined + DE_ASSERT(found != mappedConfigVariables.constEnd()); // mapping must be defined Variable &var = Config::get(found.value()); @@ -440,7 +440,7 @@ D_CMD(MappedConfigVariable) void Con_AddMappedConfigVariable(char const *consoleName, char const *opts, String const &configVariable) { - DENG2_ASSERT(!mappedConfigVariables.contains(consoleName)); // redefining not handled + DE_ASSERT(!mappedConfigVariables.contains(consoleName)); // redefining not handled mappedConfigVariables.insert(consoleName, configVariable); diff --git a/doomsday/apps/libdoomsday/src/console/exec.cpp b/doomsday/apps/libdoomsday/src/console/exec.cpp index 201b19550d..b8bd4b1f86 100644 --- a/doomsday/apps/libdoomsday/src/console/exec.cpp +++ b/doomsday/apps/libdoomsday/src/console/exec.cpp @@ -164,7 +164,7 @@ static void PrepareCmdArgs(cmdargs_t *cargs, const char *lpCmdLine) for (i = 0; i < len; ++i) { // Whitespaces are separators. - if (DENG_ISSPACE(cargs->cmdLine[i])) + if (DE_ISSPACE(cargs->cmdLine[i])) cargs->cmdLine[i] = 0; if (cargs->cmdLine[i] == '\\' && IS_ESC_CHAR(cargs->cmdLine[i + 1])) @@ -285,7 +285,7 @@ dd_bool Con_Init(void) /// DS records. consoleBinder.initNew(); initVariableBindings(consoleBinder); - consoleBinder << DENG2_FUNC(Console_ListVars, "listVars", "pattern"); + consoleBinder << DE_FUNC(Console_ListVars, "listVars", "pattern"); App::scriptSystem().addNativeModule("Console", consoleBinder.module()); exBuff = NULL; @@ -950,7 +950,7 @@ static void makeAlias(char *aName, char *command) D_CMD(Alias) { - DENG2_UNUSED(src); + DE_UNUSED(src); if (argc != 3 && argc != 2) { @@ -970,7 +970,7 @@ D_CMD(Alias) D_CMD(Parse) { - DENG2_UNUSED(src); + DE_UNUSED(src); int i; @@ -994,7 +994,7 @@ D_CMD(Parse) D_CMD(Wait) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); timespan_t offset; @@ -1007,7 +1007,7 @@ D_CMD(Wait) D_CMD(Repeat) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); int count; timespan_t interval, offset; @@ -1025,7 +1025,7 @@ D_CMD(Repeat) D_CMD(Echo) { - DENG2_UNUSED(src); + DE_UNUSED(src); int i; @@ -1071,7 +1071,7 @@ static dd_bool cvarAddSub(const char* name, float delta, dd_bool force) */ D_CMD(AddSub) { - DENG2_UNUSED(src); + DE_UNUSED(src); dd_bool force = false; float delta = 0; @@ -1099,7 +1099,7 @@ D_CMD(AddSub) */ D_CMD(IncDec) { - DENG2_UNUSED(src); + DE_UNUSED(src); dd_bool force = false; cvar_t* cvar; @@ -1145,7 +1145,7 @@ D_CMD(IncDec) */ D_CMD(Toggle) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); cvar_t *cvar = Con_FindVariable(argv[1]); if (!cvar) return false; @@ -1241,7 +1241,7 @@ D_CMD(If) } break; default: - DENG2_ASSERT_FAIL("CCmdIf: Invalid cvar type"); + DE_ASSERT_FAIL("CCmdIf: Invalid cvar type"); return false; } @@ -1259,7 +1259,7 @@ D_CMD(If) D_CMD(DebugCrash) { - DENG2_UNUSED3(src, argv, argc); + DE_UNUSED(src, argv, argc); int* ptr = (int*) 0x123; @@ -1288,7 +1288,7 @@ void Con_DataRegister() C_CMD("listaliases", NULL, ListAliases); C_CMD("listcmds", NULL, ListCmds); C_CMD("listvars", NULL, ListVars); -#ifdef DENG_DEBUG +#ifdef DE_DEBUG C_CMD("varstats", NULL, PrintVarStats); #endif } @@ -1326,13 +1326,13 @@ void Con_ShutdownDatabases(void) String Con_GameAsStyledText(Game const *game) { - DENG2_ASSERT(game != 0); + DE_ASSERT(game != 0); return String(_E(1)) + game->id() + _E(.); } static int printKnownWordWorker(knownword_t const *word, void *parameters) { - DENG_ASSERT(word); + DE_ASSERT(word); uint *numPrinted = (uint *) parameters; switch (word->type) @@ -1364,7 +1364,7 @@ static int printKnownWordWorker(knownword_t const *word, void *parameters) break; default: - DENG_ASSERT(false); + DE_ASSERT(false); break; } @@ -1374,7 +1374,7 @@ static int printKnownWordWorker(knownword_t const *word, void *parameters) D_CMD(ListVars) { - DENG_UNUSED(src); + DE_UNUSED(src); uint numPrinted = 0; LOG_SCR_MSG(_E(b) "Console variables:"); @@ -1385,7 +1385,7 @@ D_CMD(ListVars) D_CMD(ListCmds) { - DENG_UNUSED(src); + DE_UNUSED(src); LOG_SCR_MSG(_E(b) "Console commands:"); uint numPrinted = 0; @@ -1396,7 +1396,7 @@ D_CMD(ListCmds) D_CMD(ListAliases) { - DENG_UNUSED(src); + DE_UNUSED(src); LOG_SCR_MSG(_E(b) "Aliases:"); uint numPrinted = 0; @@ -1407,8 +1407,8 @@ D_CMD(ListAliases) D_CMD(DoomsdayScript) { - DENG_UNUSED(src); - DENG_UNUSED(argc); + DE_UNUSED(src); + DE_UNUSED(argc); String source; for (int i = 1; i < argc; ++i) { diff --git a/doomsday/apps/libdoomsday/src/console/knownword.cpp b/doomsday/apps/libdoomsday/src/console/knownword.cpp index 11eb33dabf..d1189c5e82 100644 --- a/doomsday/apps/libdoomsday/src/console/knownword.cpp +++ b/doomsday/apps/libdoomsday/src/console/knownword.cpp @@ -64,7 +64,7 @@ static bool compareKnownWordByName(knownword_t const &a, knownword_t const &b) case WT_GAME: textA = AutoStr_FromTextStd(reinterpret_cast(wA->data)->id().toUtf8().constData()); break; default: - DENG2_ASSERT_FAIL("compareKnownWordByName: Invalid type for word A"); + DE_ASSERT_FAIL("compareKnownWordByName: Invalid type for word A"); return false; } @@ -76,7 +76,7 @@ static bool compareKnownWordByName(knownword_t const &a, knownword_t const &b) case WT_GAME: textB = AutoStr_FromTextStd(reinterpret_cast(wB->data)->id().toUtf8().constData()); break; default: - DENG2_ASSERT_FAIL("compareKnownWordByName: Invalid type for word B"); + DE_ASSERT_FAIL("compareKnownWordByName: Invalid type for word B"); return false; } @@ -98,7 +98,7 @@ static AutoStr *textForKnownWord(knownword_t const *word) case WT_GAME: text = AutoStr_FromTextStd(reinterpret_cast(word->data)->id().toUtf8().constData()); break; default: - DENG2_ASSERT_FAIL("textForKnownWord: Invalid type for word"); + DE_ASSERT_FAIL("textForKnownWord: Invalid type for word"); text = AutoStr_FromTextStd(""); } @@ -108,7 +108,7 @@ static AutoStr *textForKnownWord(knownword_t const *word) #if 0 static dd_bool removeFromKnownWords(knownwordtype_t type, void* data) { - DENG_ASSERT(VALID_KNOWNWORDTYPE(type) && data != 0); + DE_ASSERT(VALID_KNOWNWORDTYPE(type) && data != 0); for (int i = 0; i < knownWords.size(); ++i) { @@ -207,7 +207,7 @@ int Con_IterateKnownWords(KnownWordMatchMode matchMode, int (*callback)(knownword_t const* word, void* parameters), void* parameters) { - DENG_ASSERT(callback); + DE_ASSERT(callback); knownwordtype_t matchType = (VALID_KNOWNWORDTYPE(type)? type : WT_ANY); size_t patternLength = (pattern? strlen(pattern) : 0); @@ -250,7 +250,7 @@ int Con_IterateKnownWords(KnownWordMatchMode matchMode, static int countMatchedWordWorker(knownword_t const* /*word*/, void* parameters) { - DENG_ASSERT(parameters); + DE_ASSERT(parameters); uint* count = (uint*) parameters; ++(*count); return 0; // Continue iteration. @@ -263,7 +263,7 @@ typedef struct { static int collectMatchedWordWorker(knownword_t const* word, void* parameters) { - DENG_ASSERT(word && parameters); + DE_ASSERT(word && parameters); collectmatchedwordworker_paramaters_t* p = (collectmatchedwordworker_paramaters_t*) parameters; p->matches[p->index++] = word; return 0; // Continue iteration. @@ -341,7 +341,7 @@ static void printApropos(char const *matching) D_CMD(HelpApropos) { - DENG2_UNUSED2(argc, src); + DE_UNUSED(argc, src); printApropos(argv[1]); return true; diff --git a/doomsday/apps/libdoomsday/src/console/var.cpp b/doomsday/apps/libdoomsday/src/console/var.cpp index 6469fb100a..a4b1d3e074 100644 --- a/doomsday/apps/libdoomsday/src/console/var.cpp +++ b/doomsday/apps/libdoomsday/src/console/var.cpp @@ -16,7 +16,7 @@ * http://www.gnu.org/licenses */ -#define DENG_NO_API_MACROS_URI +#define DE_NO_API_MACROS_URI #include "doomsday/console/var.h" #include "doomsday/console/exec.h" #include "doomsday/console/knownword.h" @@ -57,7 +57,7 @@ void Con_DeinitVariableDirectory() static int markVariableUserDataFreed(CVarDirectory::Node &node, void *context) { - DENG_ASSERT(context); + DE_ASSERT(context); cvar_t *var = reinterpret_cast(node.userPointer()); void **ptr = (void **) context; @@ -138,7 +138,7 @@ static cvar_t* addVariable(cvartemplate_t const& tpl) CVarDirectory::Node* node = &cvarDirectory->insert(path); cvar_t* newVar; - DENG_ASSERT(!node->userPointer()); + DE_ASSERT(!node->userPointer()); if (node->userPointer()) { throw Error("Con_AddVariable", "A variable with path '" + String(tpl.path) + "' is already known!"); @@ -162,7 +162,7 @@ static cvar_t* addVariable(cvartemplate_t const& tpl) String CVar_TypeAsText(cvar_t const *var) { // Human-readable type name. - DENG_ASSERT(var); + DE_ASSERT(var); switch (var->type) { case CVT_BYTE: @@ -178,7 +178,7 @@ String CVar_TypeAsText(cvar_t const *var) case CVT_URIPTR: return "uri"; default: - DENG2_ASSERT_FAIL("Con_VarTypeAsText: Unknown variable type"); + DE_ASSERT_FAIL("Con_VarTypeAsText: Unknown variable type"); break; } return ""; @@ -215,20 +215,20 @@ ddstring_t const* CVar_TypeName(cvartype_t type) cvartype_t CVar_Type(cvar_t const* var) { - DENG_ASSERT(var); + DE_ASSERT(var); return var->type; } int CVar_Flags(const cvar_t* var) { - DENG_ASSERT(var); + DE_ASSERT(var); return var->flags; } AutoStr *CVar_ComposePath(cvar_t const *var) { - DENG_ASSERT(var != 0); + DE_ASSERT(var != 0); CVarDirectory::Node &node = *reinterpret_cast(var->directoryNode); QByteArray path = node.path(CVARDIRECTORY_DELIMITER).toUtf8(); return AutoStr_FromTextStd(path.constData()); @@ -236,7 +236,7 @@ AutoStr *CVar_ComposePath(cvar_t const *var) void CVar_SetUri2(cvar_t *var, de::Uri const &uri, int svFlags) { - DENG_ASSERT(var); + DE_ASSERT(var); de::Uri *newUri; bool changed = false; @@ -291,7 +291,7 @@ void CVar_SetUri(cvar_t *var, de::Uri const &uri) void CVar_SetString2(cvar_t *var, char const *text, int svFlags) { - DENG_ASSERT(var != 0); + DE_ASSERT(var != 0); bool changed = false; size_t oldLen, newLen; @@ -338,7 +338,7 @@ void CVar_SetString(cvar_t* var, char const* text) void CVar_SetInteger2(cvar_t* var, int value, int svFlags) { - DENG_ASSERT(var); + DE_ASSERT(var); bool changed = false; @@ -383,7 +383,7 @@ void CVar_SetInteger(cvar_t* var, int value) void CVar_SetFloat2(cvar_t* var, float value, int svFlags) { - DENG_ASSERT(var); + DE_ASSERT(var); bool changed = false; @@ -437,7 +437,7 @@ static void printConversionWarning(cvar_t const *var) int CVar_Integer(cvar_t const* var) { - DENG_ASSERT(var); + DE_ASSERT(var); switch (var->type) { case CVT_BYTE: return CV_BYTE(var); @@ -453,7 +453,7 @@ int CVar_Integer(cvar_t const* var) float CVar_Float(cvar_t const* var) { - DENG_ASSERT(var); + DE_ASSERT(var); switch (var->type) { case CVT_BYTE: return CV_BYTE(var); @@ -469,7 +469,7 @@ float CVar_Float(cvar_t const* var) byte CVar_Byte(cvar_t const* var) { - DENG_ASSERT(var); + DE_ASSERT(var); switch (var->type) { case CVT_BYTE: return CV_BYTE(var); @@ -485,7 +485,7 @@ byte CVar_Byte(cvar_t const* var) char const* CVar_String(cvar_t const* var) { - DENG_ASSERT(var); + DE_ASSERT(var); /// @todo Why not implement in-place value to string conversion? switch (var->type) { @@ -584,7 +584,7 @@ String Con_VarAsStyledText(cvar_t *var, char const *prefix) os << "\"" << (CV_URIPTR(var)? CV_URIPTR(var)->asText() : "") << "\""; break; } default: - DENG_ASSERT(false); + DE_ASSERT(false); break; } os << _E(<); @@ -598,7 +598,7 @@ void Con_PrintCVar(cvar_t* var, char const *prefix) static int addVariableToKnownWords(CVarDirectory::Node& node, void* /*parameters*/) { - //DENG_ASSERT(parameters); + //DE_ASSERT(parameters); cvar_t* var = reinterpret_cast( node.userPointer() ); //uint* index = (uint*) parameters; @@ -625,7 +625,7 @@ void Con_SetVariable(Path const &varPath, int value, int svFlags) } else { - DENG2_ASSERT_FAIL("Con_SetVariable: Invalid console variable path"); + DE_ASSERT_FAIL("Con_SetVariable: Invalid console variable path"); } } @@ -710,11 +710,11 @@ static Value *Function_Console_Set(Context &, Function::ArgumentValues const &ar void initVariableBindings(Binder &binder) { binder - << DENG2_FUNC(Console_Get, "get", "name") - << DENG2_FUNC(Console_Set, "set", "name" << "value"); + << DE_FUNC(Console_Get, "get", "name") + << DE_FUNC(Console_Set, "set", "name" << "value"); } -#ifdef DENG_DEBUG +#ifdef DE_DEBUG typedef struct { uint count; cvartype_t type; @@ -724,7 +724,7 @@ typedef struct { static int countVariable(CVarDirectory::Node& node, void* parameters) { - DENG_ASSERT(parameters); + DE_ASSERT(parameters); countvariableparams_t* p = (countvariableparams_t*) parameters; cvar_t* var = reinterpret_cast( node.userPointer() ); @@ -747,7 +747,7 @@ static int countVariable(CVarDirectory::Node& node, void* parameters) D_CMD(PrintVarStats) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); uint numCVars = 0, numCVarsHidden = 0; diff --git a/doomsday/apps/libdoomsday/src/defs/dedparser.cpp b/doomsday/apps/libdoomsday/src/defs/dedparser.cpp index 5cf14dbef2..fb8539af8d 100644 --- a/doomsday/apps/libdoomsday/src/defs/dedparser.cpp +++ b/doomsday/apps/libdoomsday/src/defs/dedparser.cpp @@ -33,7 +33,7 @@ * 02110-1301 USA */ -#define DENG_NO_API_MACROS_URI +#define DE_NO_API_MACROS_URI #include "doomsday/defs/dedparser.h" #include "doomsday/doomsdayapp.h" @@ -164,7 +164,7 @@ void DED_SetXGClassLinks(struct xgclass_s *links) xgClassLinks = links; } -DENG2_PIMPL(DEDParser) +DE_PIMPL(DEDParser) { ded_t *ded; @@ -438,7 +438,7 @@ DENG2_PIMPL(DEDParser) int ReadString(char *dest, int maxLen) { - DENG_ASSERT(dest != 0); + DE_ASSERT(dest != 0); String buffer; if (!ReadString(buffer)) return false; qstrncpy(dest, buffer.toUtf8().constData(), maxLen); @@ -604,7 +604,7 @@ DENG2_PIMPL(DEDParser) int ReadFlags(int *dest, char const *prefix) { - DENG2_ASSERT(dest); + DE_ASSERT(dest); // By default, no flags are set. *dest = 0; @@ -963,7 +963,7 @@ DENG2_PIMPL(DEDParser) { ded->addFlag(id, value); Record &flag = ded->flags.find(VAR_ID, id); - DENG2_ASSERT(flag.geti("value") == value); // Sanity check. + DE_ASSERT(flag.geti("value") == value); // Sanity check. if (source->custom) flag.set("custom", true); } } @@ -1011,7 +1011,7 @@ DENG2_PIMPL(DEDParser) retVal = false; goto ded_end_read; } - DENG2_ASSERT(epsd != 0); + DE_ASSERT(epsd != 0); if (prevEpisodeDefIdx >= 0 && bCopyNext) { @@ -1044,7 +1044,7 @@ DENG2_PIMPL(DEDParser) { mainDef.addHub(); } - DENG_ASSERT(hub < mainDef.hubCount()); + DE_ASSERT(hub < mainDef.hubCount()); hubRec = &mainDef.hub(hub); if (source->custom) hubRec->set("custom", true); @@ -1064,7 +1064,7 @@ DENG2_PIMPL(DEDParser) (*hubRec)["map"].array() .add(new RecordValue(map.take(), RecordValue::OwnsRecord)); } - DENG_ASSERT(map < int(hubRec->geta("map").size())); + DE_ASSERT(map < int(hubRec->geta("map").size())); Record &mapRec = *hubRec->geta("map")[map].as().record(); if (source->custom) mapRec.set("custom", true); @@ -1084,7 +1084,7 @@ DENG2_PIMPL(DEDParser) { mgNodeDef.addExit(); } - DENG_ASSERT(exit < mgNodeDef.exitCount()); + DE_ASSERT(exit < mgNodeDef.exitCount()); Record &exitRec = mgNodeDef.exit(exit); if (source->custom) exitRec.set("custom", true); @@ -1119,7 +1119,7 @@ DENG2_PIMPL(DEDParser) (*epsd)["map"].array() .add(new RecordValue(map.take(), RecordValue::OwnsRecord)); } - DENG_ASSERT(notHubMap < int(epsd->geta("map").size())); + DE_ASSERT(notHubMap < int(epsd->geta("map").size())); Record &mapRec = *epsd->geta("map")[notHubMap].as().record(); if (source->custom) mapRec.set("custom", true); @@ -1139,7 +1139,7 @@ DENG2_PIMPL(DEDParser) { mgNodeDef.addExit(); } - DENG_ASSERT(exit < mgNodeDef.exitCount()); + DE_ASSERT(exit < mgNodeDef.exitCount()); Record &exitRec = mgNodeDef.exit(exit); if (source->custom) exitRec.set("custom", true); @@ -1486,7 +1486,7 @@ DENG2_PIMPL(DEDParser) retVal = false; goto ded_end_read; } - DENG2_ASSERT(mat); + DE_ASSERT(mat); // Should we copy the previous definition? if (prevMaterialDefIdx >= 0 && bCopyNext) @@ -1696,7 +1696,7 @@ DENG2_PIMPL(DEDParser) { mainDef.addSub(); } - DENG_ASSERT(sub < mainDef.subCount()); + DE_ASSERT(sub < mainDef.subCount()); Record &subDef = mainDef.sub(sub); @@ -1816,7 +1816,7 @@ DENG2_PIMPL(DEDParser) retVal = false; goto ded_end_read; } - DENG2_ASSERT(music != 0); + DE_ASSERT(music != 0); if (prevMusicDefIdx >= 0 && bCopyNext) { @@ -1911,7 +1911,7 @@ DENG2_PIMPL(DEDParser) { mainDef.addModel(); } - DENG_ASSERT(model < mainDef.modelCount()); + DE_ASSERT(model < mainDef.modelCount()); Record &mdlDef = mainDef.model(model); if (source->custom) mdlDef.set("custom", true); @@ -2039,7 +2039,7 @@ DENG2_PIMPL(DEDParser) retVal = false; goto ded_end_read; } - DENG2_ASSERT(mi != 0); + DE_ASSERT(mi != 0); if (prevMapInfoDefIdx >= 0 && bCopyNext) { @@ -2119,7 +2119,7 @@ DENG2_PIMPL(DEDParser) { skyDef.addModel(); } - DENG_ASSERT(model < skyDef.modelCount()); + DE_ASSERT(model < skyDef.modelCount()); Record &mdlDef = skyDef.model(model); if (source->custom) mdlDef.set("custom", true); diff --git a/doomsday/apps/libdoomsday/src/defs/dedregister.cpp b/doomsday/apps/libdoomsday/src/defs/dedregister.cpp index 5496207958..d35778f700 100644 --- a/doomsday/apps/libdoomsday/src/defs/dedregister.cpp +++ b/doomsday/apps/libdoomsday/src/defs/dedregister.cpp @@ -30,11 +30,11 @@ using namespace de; static String const VAR_ORDER = "order"; -DENG2_PIMPL(DEDRegister) -, DENG2_OBSERVES(Record, Deletion) -, DENG2_OBSERVES(Record, Addition) -, DENG2_OBSERVES(Record, Removal) -, DENG2_OBSERVES(Variable, ChangeFrom) +DE_PIMPL(DEDRegister) +, DE_OBSERVES(Record, Deletion) +, DE_OBSERVES(Record, Addition) +, DE_OBSERVES(Record, Removal) +, DE_OBSERVES(Variable, ChangeFrom) { Record *names; ArrayValue *orderArray; @@ -54,9 +54,9 @@ DENG2_PIMPL(DEDRegister) orderArray = &names->addArray(VAR_ORDER).array(); } - void recordBeingDeleted(Record &DENG2_DEBUG_ONLY(record)) + void recordBeingDeleted(Record &DE_DEBUG_ONLY(record)) { - DENG2_ASSERT(names == &record); + DE_ASSERT(names == &record); names = nullptr; orderArray = nullptr; } @@ -67,11 +67,11 @@ DENG2_PIMPL(DEDRegister) // each definition record are deleted. order().clear(); -#ifdef DENG2_DEBUG - DENG2_ASSERT(parents.isEmpty()); +#ifdef DE_DEBUG + DE_ASSERT(parents.isEmpty()); foreach (String const &key, keys.keys()) { - DENG2_ASSERT(lookup(key).size() == 0); + DE_ASSERT(lookup(key).size() == 0); } #endif } @@ -84,13 +84,13 @@ DENG2_PIMPL(DEDRegister) ArrayValue &order() { - DENG2_ASSERT(orderArray != nullptr); + DE_ASSERT(orderArray != nullptr); return *orderArray; } ArrayValue const &order() const { - DENG2_ASSERT(orderArray != nullptr); + DE_ASSERT(orderArray != nullptr); return *orderArray; } @@ -173,8 +173,8 @@ DENG2_PIMPL(DEDRegister) return false; String valText = value.asText(); - DENG2_ASSERT(!valText.isEmpty()); - DENG2_ASSERT(keys.contains(key)); + DE_ASSERT(!valText.isEmpty()); + DE_ASSERT(keys.contains(key)); if (!keys[key].flags.testFlag(CaseSensitive)) { @@ -202,8 +202,8 @@ DENG2_PIMPL(DEDRegister) return false; String valText = value.asText(); - DENG2_ASSERT(!valText.isEmpty()); - DENG2_ASSERT(keys.contains(key)); + DE_ASSERT(!valText.isEmpty()); + DE_ASSERT(keys.contains(key)); if (!keys[key].flags.testFlag(CaseSensitive)) { @@ -265,7 +265,7 @@ DENG2_PIMPL(DEDRegister) //qDebug() << "changed" << key.name() << "from" << oldValue.asText() << "to" // << newValue.asText(); - DENG2_ASSERT(parents.contains(&key)); + DE_ASSERT(parents.contains(&key)); // The value of a key has changed, so it needs to be reindexed. removeFromLookup(key.name(), oldValue, *parents[&key]); @@ -303,7 +303,7 @@ Record &DEDRegister::copy(int fromIndex, Record &to) // By default lookup keys are not copied, as they are used as identifiers and // therefore duplicates should not occur. - DENG2_FOR_EACH_CONST(Impl::Keys, i, d->keys) + DE_FOR_EACH_CONST(Impl::Keys, i, d->keys) { if (i.value().flags.testFlag(AllowCopy)) continue; omitted << i.key(); diff --git a/doomsday/apps/libdoomsday/src/doomsdayapp.cpp b/doomsday/apps/libdoomsday/src/doomsdayapp.cpp index 6436d35bc1..2473520002 100644 --- a/doomsday/apps/libdoomsday/src/doomsdayapp.cpp +++ b/doomsday/apps/libdoomsday/src/doomsdayapp.cpp @@ -78,7 +78,7 @@ static String const PATH_LOCAL_PACKS("/local/packs"); static DoomsdayApp *theDoomsdayApp = nullptr; -DENG2_PIMPL(DoomsdayApp) +DE_PIMPL(DoomsdayApp) , public IFolderPopulationObserver { std::string ddBasePath; // Doomsday root directory is at...? @@ -109,7 +109,7 @@ DENG2_PIMPL(DoomsdayApp) /** * Delegates game change notifications to scripts. */ - class GameChangeScriptAudience : DENG2_OBSERVES(DoomsdayApp, GameChange) + class GameChangeScriptAudience : DE_OBSERVES(DoomsdayApp, GameChange) { public: void currentGameChanged(Game const &newGame) @@ -148,7 +148,7 @@ DENG2_PIMPL(DoomsdayApp) configSaveTimer.setSingleShot(false); QObject::connect(&configSaveTimer, &QTimer::timeout, [this] () { - DENG2_FOR_PUBLIC_AUDIENCE2(PeriodicAutosave, i) + DE_FOR_PUBLIC_AUDIENCE2(PeriodicAutosave, i) { if (!this->busyMode.isActive()) { @@ -480,7 +480,7 @@ DENG2_PIMPL(DoomsdayApp) App::setCurrentWorkPath(App::app().nativeHomePath()); // libcore has determined the native base path, so let FS1 know about it. - self().setDoomsdayBasePath(DENG2_APP->nativeBasePath()); + self().setDoomsdayBasePath(DE_APP->nativeBasePath()); } #endif // UNIX @@ -502,23 +502,23 @@ DENG2_PIMPL(DoomsdayApp) } #endif // WIN32 - DENG2_PIMPL_AUDIENCE(GameLoad) - DENG2_PIMPL_AUDIENCE(GameUnload) - DENG2_PIMPL_AUDIENCE(GameChange) - DENG2_PIMPL_AUDIENCE(ConsoleRegistration) - DENG2_PIMPL_AUDIENCE(PeriodicAutosave) + DE_PIMPL_AUDIENCE(GameLoad) + DE_PIMPL_AUDIENCE(GameUnload) + DE_PIMPL_AUDIENCE(GameChange) + DE_PIMPL_AUDIENCE(ConsoleRegistration) + DE_PIMPL_AUDIENCE(PeriodicAutosave) }; -DENG2_AUDIENCE_METHOD(DoomsdayApp, GameLoad) -DENG2_AUDIENCE_METHOD(DoomsdayApp, GameUnload) -DENG2_AUDIENCE_METHOD(DoomsdayApp, GameChange) -DENG2_AUDIENCE_METHOD(DoomsdayApp, ConsoleRegistration) -DENG2_AUDIENCE_METHOD(DoomsdayApp, PeriodicAutosave) +DE_AUDIENCE_METHOD(DoomsdayApp, GameLoad) +DE_AUDIENCE_METHOD(DoomsdayApp, GameUnload) +DE_AUDIENCE_METHOD(DoomsdayApp, GameChange) +DE_AUDIENCE_METHOD(DoomsdayApp, ConsoleRegistration) +DE_AUDIENCE_METHOD(DoomsdayApp, PeriodicAutosave) DoomsdayApp::DoomsdayApp(Players::Constructor playerConstructor) : d(new Impl(this, playerConstructor)) { - DENG2_ASSERT(!theDoomsdayApp); + DE_ASSERT(!theDoomsdayApp); theDoomsdayApp = this; App::app().addInitPackage("net.dengine.base"); @@ -611,7 +611,7 @@ void DoomsdayApp::determineGlobalPaths() DoomsdayApp &DoomsdayApp::app() { - DENG2_ASSERT(theDoomsdayApp); + DE_ASSERT(theDoomsdayApp); return *theDoomsdayApp; } @@ -749,7 +749,7 @@ void *DoomsdayApp::moduleHandle() const Game const &DoomsdayApp::game() { - DENG2_ASSERT(app().d->currentGame != 0); + DE_ASSERT(app().d->currentGame != 0); return *app().d->currentGame; } @@ -839,10 +839,10 @@ void DoomsdayApp::unloadGame(GameProfile const &/*upcomingGame*/) void DoomsdayApp::uncacheFilesFromMemory() { - ArchiveFeed::uncacheAllEntries(StringList({ DENG2_TYPE_NAME(Folder), - DENG2_TYPE_NAME(ArchiveFolder), - DENG2_TYPE_NAME(DataFolder), - DENG2_TYPE_NAME(GameStateFolder) })); + ArchiveFeed::uncacheAllEntries(StringList({ DE_TYPE_NAME(Folder), + DE_TYPE_NAME(ArchiveFolder), + DE_TYPE_NAME(DataFolder), + DE_TYPE_NAME(GameStateFolder) })); } void DoomsdayApp::clearCache() @@ -864,7 +864,7 @@ void DoomsdayApp::reset() // Reinitialize the console. Con_ClearDatabases(); Con_InitDatabases(); - DENG2_FOR_AUDIENCE2(ConsoleRegistration, i) + DE_FOR_AUDIENCE2(ConsoleRegistration, i) { i->consoleRegistration(); } @@ -968,11 +968,11 @@ bool DoomsdayApp::changeGame(GameProfile const &profile, d->gameBeingChanged = true; // The current game will now be unloaded. - DENG2_FOR_AUDIENCE2(GameUnload, i) i->aboutToUnloadGame(game()); + DE_FOR_AUDIENCE2(GameUnload, i) i->aboutToUnloadGame(game()); unloadGame(profile); // Do the switch. - DENG2_FOR_AUDIENCE2(GameLoad, i) i->aboutToLoadGame(newGame); + DE_FOR_AUDIENCE2(GameLoad, i) i->aboutToLoadGame(newGame); makeGameCurrent(profile); /* @@ -1033,12 +1033,12 @@ bool DoomsdayApp::changeGame(GameProfile const &profile, } } - DENG_ASSERT(plugins().activePluginId() == 0); + DE_ASSERT(plugins().activePluginId() == 0); d->gameBeingChanged = false; // Game change is complete. - DENG2_FOR_AUDIENCE2(GameChange, i) + DE_FOR_AUDIENCE2(GameChange, i) { i->currentGameChanged(game()); } diff --git a/doomsday/apps/libdoomsday/src/doomsdayapp_bindings.cpp b/doomsday/apps/libdoomsday/src/doomsdayapp_bindings.cpp index a8481fdac9..82c87a6eac 100644 --- a/doomsday/apps/libdoomsday/src/doomsdayapp_bindings.cpp +++ b/doomsday/apps/libdoomsday/src/doomsdayapp_bindings.cpp @@ -50,8 +50,8 @@ static Value *Function_FS_RefreshPackageFolders(Context &, const Function::Argum void DoomsdayApp::initBindings(Binder &binder) { binder.init(ScriptSystem::get()["App"]) - << DENG2_FUNC(App_Download, "download", "packageId"); + << DE_FUNC(App_Download, "download", "packageId"); binder.init(ScriptSystem::get()["FS"]) - << DENG2_FUNC_NOARG(FS_RefreshPackageFolders, "refreshPackageFolders"); + << DE_FUNC_NOARG(FS_RefreshPackageFolders, "refreshPackageFolders"); } diff --git a/doomsday/apps/libdoomsday/src/filesys/datafile.cpp b/doomsday/apps/libdoomsday/src/filesys/datafile.cpp index ec6a4978ed..783c31a804 100644 --- a/doomsday/apps/libdoomsday/src/filesys/datafile.cpp +++ b/doomsday/apps/libdoomsday/src/filesys/datafile.cpp @@ -40,7 +40,7 @@ DataFile::DataFile(Format format, File &sourceFile) DataFile::~DataFile() { - DENG2_FOR_AUDIENCE2(Deletion, i) i->fileBeingDeleted(*this); + DE_FOR_AUDIENCE2(Deletion, i) i->fileBeingDeleted(*this); audienceForDeletion().clear(); deindex(); } diff --git a/doomsday/apps/libdoomsday/src/filesys/datafolder.cpp b/doomsday/apps/libdoomsday/src/filesys/datafolder.cpp index 5eac49165f..6c94e836a2 100644 --- a/doomsday/apps/libdoomsday/src/filesys/datafolder.cpp +++ b/doomsday/apps/libdoomsday/src/filesys/datafolder.cpp @@ -41,13 +41,13 @@ DataFolder::DataFolder(Format format, File &sourceFile) } else { - DENG2_ASSERT_FAIL("DataFolder doesn't know how to access the source file"); + DE_ASSERT_FAIL("DataFolder doesn't know how to access the source file"); }*/ } DataFolder::~DataFolder() { - DENG2_FOR_AUDIENCE2(Deletion, i) i->fileBeingDeleted(*this); + DE_FOR_AUDIENCE2(Deletion, i) i->fileBeingDeleted(*this); audienceForDeletion().clear(); deindex(); } diff --git a/doomsday/apps/libdoomsday/src/filesys/filehandle.cpp b/doomsday/apps/libdoomsday/src/filesys/filehandle.cpp index 49153a82ba..565dbcdd34 100644 --- a/doomsday/apps/libdoomsday/src/filesys/filehandle.cpp +++ b/doomsday/apps/libdoomsday/src/filesys/filehandle.cpp @@ -36,7 +36,7 @@ namespace de { //struct FileHandle::Impl -DENG2_PIMPL_NOREF(FileHandle) +DE_PIMPL_NOREF(FileHandle) { /// The referenced file (if any). File1 *file; @@ -68,7 +68,7 @@ DENG2_PIMPL_NOREF(FileHandle) static void errorIfNotValid(FileHandle const &file, char const * /*callerName*/) { - DENG2_ASSERT(file.isValid()); + DE_ASSERT(file.isValid()); if (!file.isValid()) exit(1); } diff --git a/doomsday/apps/libdoomsday/src/filesys/fileid.cpp b/doomsday/apps/libdoomsday/src/filesys/fileid.cpp index 35aeb81d14..c5cdaf55b6 100644 --- a/doomsday/apps/libdoomsday/src/filesys/fileid.cpp +++ b/doomsday/apps/libdoomsday/src/filesys/fileid.cpp @@ -35,7 +35,7 @@ using namespace de; FileId::FileId(Md5Hash _md5) : md5_(_md5.left(16)) -#ifdef DENG_DEBUG +#ifdef DE_DEBUG , path_("unknown-path") #endif {} @@ -43,7 +43,7 @@ FileId::FileId(Md5Hash _md5) FileId::FileId(FileId const &other) : LogEntry::Arg::Base() , md5_(other.md5()) -#ifdef DENG_DEBUG +#ifdef DE_DEBUG , path_(other.path()) #endif {} @@ -83,7 +83,7 @@ String FileId::asText() const FileId FileId::fromPath(String path) { FileId fileId = FileId(hash(path)); -#ifdef DENG_DEBUG +#ifdef DE_DEBUG fileId.setPath(path); #endif return fileId; diff --git a/doomsday/apps/libdoomsday/src/filesys/filetype.cpp b/doomsday/apps/libdoomsday/src/filesys/filetype.cpp index 9eea18fd59..560db3f6d0 100644 --- a/doomsday/apps/libdoomsday/src/filesys/filetype.cpp +++ b/doomsday/apps/libdoomsday/src/filesys/filetype.cpp @@ -44,7 +44,7 @@ FileType const &DD_GuessFileTypeFromFileName(String path) { if (!path.isEmpty()) { - DENG2_FOR_EACH_CONST(FileTypes, i, fileTypeMap) + DE_FOR_EACH_CONST(FileTypes, i, fileTypeMap) { FileType const &ftype = **i; if (ftype.fileNameIsKnown(path)) diff --git a/doomsday/apps/libdoomsday/src/filesys/fs_main.cpp b/doomsday/apps/libdoomsday/src/filesys/fs_main.cpp index 1af9ac8901..7850621f12 100644 --- a/doomsday/apps/libdoomsday/src/filesys/fs_main.cpp +++ b/doomsday/apps/libdoomsday/src/filesys/fs_main.cpp @@ -163,7 +163,7 @@ static bool matchFileName(String const &string, String const &pattern) return st->isNull(); } -DENG2_PIMPL(FS1) +DE_PIMPL(FS1) { bool loadingForStartup; ///< @c true= Flag newly opened files as "startup". @@ -203,7 +203,7 @@ DENG2_PIMPL(FS1) void clearAllSchemes() { - DENG2_FOR_EACH(Schemes, i, schemes) + DE_FOR_EACH(Schemes, i, schemes) { delete *i; } @@ -273,7 +273,7 @@ DENG2_PIMPL(FS1) if (scheme.findAll(name, foundNodes)) { // At least one node name was matched (perhaps partially). - DENG2_FOR_EACH_CONST(Scheme::FoundNodes, i, foundNodes) + DE_FOR_EACH_CONST(Scheme::FoundNodes, i, foundNodes) { PathTree::Node &node = **i; if (!node.comparePath(search.path(), PathTree::NoBranch)) @@ -320,7 +320,7 @@ DENG2_PIMPL(FS1) // Nope. Any applicable dir/WAD redirects? if (!lumpMappings.empty()) { - DENG2_FOR_EACH_CONST(LumpMappings, i, lumpMappings) + DE_FOR_EACH_CONST(LumpMappings, i, lumpMappings) { LumpMapping const &mapping = *i; if (mapping.first.compare(path)) continue; @@ -337,7 +337,7 @@ DENG2_PIMPL(FS1) FILE *findAndOpenNativeFile(String path, String const &mymode, String &foundPath) { - DENG2_ASSERT(!path.isEmpty()); + DE_ASSERT(!path.isEmpty()); // We must have an absolute path - prepend the CWD if necessary. path = NativePath::workPath().withSeparators('/') / path; @@ -363,7 +363,7 @@ DENG2_PIMPL(FS1) { QByteArray pathUtf8 = path.toUtf8(); AutoStr *mapped = AutoStr_NewStd(); - DENG2_FOR_EACH_CONST(PathMappings, i, pathMappings) + DE_FOR_EACH_CONST(PathMappings, i, pathMappings) { Str_Set(mapped, pathUtf8.constData()); if (!applyPathMapping(mapped, *i)) continue; @@ -461,7 +461,7 @@ FS1::FS1() : d(new Impl(this)) FS1::Scheme &FS1::createScheme(String name, Scheme::Flags flags) { - DENG2_ASSERT(name.length() >= Scheme::min_name_length); + DE_ASSERT(name.length() >= Scheme::min_name_length); // Ensure this is a unique name. if (knownScheme(name)) return scheme(name); @@ -474,7 +474,7 @@ FS1::Scheme &FS1::createScheme(String name, Scheme::Flags flags) void FS1::index(File1 &file) { -#ifdef DENG_DEBUG +#ifdef DE_DEBUG // Ensure this hasn't yet been indexed. FileList::const_iterator found = findListFile(d->loadedFiles, file); if (found != d->loadedFiles.end()) @@ -552,7 +552,7 @@ File1 &FS1::find(de::Uri const &search) FileList::iterator found = findListFileByPath(d->loadedFiles, searchPath); if (found != d->loadedFiles.end()) { - DENG_ASSERT((*found)->hasFile()); + DE_ASSERT((*found)->hasFile()); return (*found)->file(); } } @@ -594,9 +594,9 @@ String FS1::findPath(de::Uri const &search, int flags, ResourceClass &rclass) */ String searchPathWithoutFileNameExtension = searchPath.fileNamePath() / searchPath.fileNameWithoutExtension(); - DENG2_FOR_EACH_CONST(ResourceClass::FileTypes, typeIt, rclass.fileTypes()) + DE_FOR_EACH_CONST(ResourceClass::FileTypes, typeIt, rclass.fileTypes()) { - DENG2_FOR_EACH_CONST(QStringList, i, (*typeIt)->knownFileNameExtensions()) + DE_FOR_EACH_CONST(QStringList, i, (*typeIt)->knownFileNameExtensions()) { String const &ext = *i; String found = d->findPath(de::Uri(search.scheme(), searchPathWithoutFileNameExtension + ext)); @@ -620,11 +620,11 @@ String FS1::findPath(de::Uri const &search, int flags) return findPath(search, flags, ResourceClass::classForId(RC_NULL)); } -#ifdef DENG_DEBUG +#ifdef DE_DEBUG static void printFileIds(FileIds const &fileIds) { uint idx = 0; - DENG2_FOR_EACH_CONST(FileIds, i, fileIds) + DE_FOR_EACH_CONST(FileIds, i, fileIds) { LOGDEV_RES_MSG(" %u - %s : \"%s\"") << idx << *i << i->path(); ++idx; @@ -632,11 +632,11 @@ static void printFileIds(FileIds const &fileIds) } #endif -#ifdef DENG_DEBUG +#ifdef DE_DEBUG static void printFileList(FS1::FileList &list) { uint idx = 0; - DENG2_FOR_EACH_CONST(FS1::FileList, i, list) + DE_FOR_EACH_CONST(FS1::FileList, i, list) { FileHandle &hndl = **i; File1 &file = hndl.file(); @@ -652,7 +652,7 @@ static void printFileList(FS1::FileList &list) int FS1::unloadAllNonStartupFiles() { -#ifdef DENG_DEBUG +#ifdef DE_DEBUG // List all open files with their identifiers. if (LogBuffer::get().isEnabled(LogEntry::Generic | LogEntry::Verbose)) { @@ -674,7 +674,7 @@ int FS1::unloadAllNonStartupFiles() numUnloadedFiles += 1; } -#ifdef DENG_DEBUG +#ifdef DE_DEBUG // Sanity check: look for orphaned identifiers. if (!d->fileIds.empty()) { @@ -748,7 +748,7 @@ void FS1::releaseFile(File1 &file) static Wad *findFirstWadFile(FS1::FileList &list, bool custom) { if (list.empty()) return 0; - DENG2_FOR_EACH(FS1::FileList, i, list) + DE_FOR_EACH(FS1::FileList, i, list) { File1 &file = (*i)->file(); if (custom != file.hasCustom()) continue; @@ -786,7 +786,7 @@ int FS1::findAll(bool (*predicate)(File1 &file, void *parameters), void *paramet FS1::FileList &found) const { int numFound = 0; - DENG2_FOR_EACH_CONST(FS1::FileList, i, d->loadedFiles) + DE_FOR_EACH_CONST(FS1::FileList, i, d->loadedFiles) { // Interested in this file? if (predicate && !predicate((*i)->file(), parameters)) continue; // Nope. @@ -810,7 +810,7 @@ int FS1::findAllPaths(Path searchPattern, int flags, FS1::PathList &found) /* * Check the Zip directory. */ - DENG2_FOR_EACH_CONST(LumpIndex::Lumps, i, d->zipFileIndex.allLumps()) + DE_FOR_EACH_CONST(LumpIndex::Lumps, i, d->zipFileIndex.allLumps()) { File1 const &lump = **i; PathTree::Node const &node = lump.directoryNode(); @@ -843,7 +843,7 @@ int FS1::findAllPaths(Path searchPattern, int flags, FS1::PathList &found) */ if (!d->lumpMappings.empty()) { - DENG2_FOR_EACH_CONST(LumpMappings, i, d->lumpMappings) + DE_FOR_EACH_CONST(LumpMappings, i, d->lumpMappings) { if (!matchFileName(i->first, searchPattern)) continue; @@ -907,7 +907,7 @@ int FS1::findAllPaths(Path searchPattern, int flags, FS1::PathList &found) File1 &FS1::interpret(FileHandle &hndl, String filePath, FileInfo const &info) { - DENG2_ASSERT(!filePath.isEmpty()); + DE_ASSERT(!filePath.isEmpty()); File1 *interpretedFile = 0; @@ -922,7 +922,7 @@ File1 &FS1::interpret(FileHandle &hndl, String filePath, FileInfo const &info) if (!interpretedFile) { FileTypes const &fileTypes = DD_FileTypes(); - DENG2_FOR_EACH_CONST(FileTypes, i, fileTypes) + DE_FOR_EACH_CONST(FileTypes, i, fileTypes) { if (NativeFileType const *fileType = dynamic_cast(*i)) { @@ -943,13 +943,13 @@ File1 &FS1::interpret(FileHandle &hndl, String filePath, FileInfo const &info) interpretedFile = new File1(&hndl, filePath, info, container); } - DENG2_ASSERT(interpretedFile); + DE_ASSERT(interpretedFile); return *interpretedFile; } FileHandle &FS1::openFile(String const &path, String const &mode, size_t baseOffset, bool allowDuplicate) { -#ifdef DENG_DEBUG +#ifdef DE_DEBUG for (int i = 0; i < mode.length(); ++i) { if (mode[i] != 'r' && mode[i] != 't' && mode[i] != 'b' && mode[i] != 'f') @@ -996,7 +996,7 @@ void FS1::addPathLumpMapping(String lumpName, String destination) // We require an absolute path - prepend the CWD if necessary. if (QDir::isRelativePath(destination)) { - String workPath = DENG2_APP->currentWorkPath().withSeparators('/'); + String workPath = DE_APP->currentWorkPath().withSeparators('/'); destination = workPath / destination; } @@ -1095,7 +1095,7 @@ void FS1::printDirectory(Path path) { qSort(found.begin(), found.end()); - DENG2_FOR_EACH_CONST(PathList, i, found) + DE_FOR_EACH_CONST(PathList, i, found) { LOG_RES_MSG(" %s") << NativePath(i->path).pretty(); } @@ -1131,7 +1131,7 @@ FS1::Schemes const &FS1::allSchemes() /// Print contents of directories as Doomsday sees them. D_CMD(Dir) { - DENG2_UNUSED(src); + DE_UNUSED(src); if (argc > 1) { for (int i = 1; i < argc; ++i) @@ -1150,7 +1150,7 @@ D_CMD(Dir) /// Dump a copy of a virtual file to the runtime directory. D_CMD(DumpLump) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); if (fileSystem) { @@ -1168,7 +1168,7 @@ D_CMD(DumpLump) /// List virtual files inside containers. D_CMD(ListLumps) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); if (!fileSystem) return false; @@ -1179,7 +1179,7 @@ D_CMD(ListLumps) LOG_RES_MSG("LumpIndex %p (%i records):") << &lumpIndex << numRecords; int idx = 0; - DENG2_FOR_EACH_CONST(LumpIndex::Lumps, i, lumpIndex.allLumps()) + DE_FOR_EACH_CONST(LumpIndex::Lumps, i, lumpIndex.allLumps()) { File1 const &lump = **i; String containerPath = NativePath(lump.container().composePath()).pretty(); @@ -1200,7 +1200,7 @@ D_CMD(ListLumps) /// List presently loaded files in original load order. D_CMD(ListFiles) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); LOG_RES_MSG(_E(b) "Loaded Files " _E(l) "(in load order)" _E(w) ":"); @@ -1209,7 +1209,7 @@ D_CMD(ListFiles) if (fileSystem) { FS1::FileList const &allLoadedFiles = App_FileSystem().loadedFiles(); - DENG2_FOR_EACH_CONST(FS1::FileList, i, allLoadedFiles) + DE_FOR_EACH_CONST(FS1::FileList, i, allLoadedFiles) { File1 &file = (*i)->file(); uint crc = 0; @@ -1272,7 +1272,7 @@ String App_BasePath() void F_Init() { - DENG2_ASSERT(!fileSystem); + DE_ASSERT(!fileSystem); fileSystem = new FS1(); } diff --git a/doomsday/apps/libdoomsday/src/filesys/fs_scheme.cpp b/doomsday/apps/libdoomsday/src/filesys/fs_scheme.cpp index a7735c0fe7..4a118a6deb 100644 --- a/doomsday/apps/libdoomsday/src/filesys/fs_scheme.cpp +++ b/doomsday/apps/libdoomsday/src/filesys/fs_scheme.cpp @@ -262,7 +262,7 @@ struct FS1::Scheme::Impl // Process this search. FS1::PathList found; App_FileSystem().findAllPaths(searchPattern, flags, found); - DENG2_FOR_EACH_CONST(FS1::PathList, i, found) + DE_FOR_EACH_CONST(FS1::PathList, i, found) { addDirectoryPathAndMaybeDescendBranch(!(flags & SearchPath::NoDescend), i->path, !!(i->attrib & A_SUBDIR), @@ -292,7 +292,7 @@ struct FS1::Scheme::Impl if (node->userValue()) { // Process it again? - DENG2_FOR_EACH_CONST(PathTree::Nodes, i, directory.leafNodes()) + DE_FOR_EACH_CONST(PathTree::Nodes, i, directory.leafNodes()) { PathTree::Node &sibling = **i; if (&sibling.parent() == node) @@ -424,7 +424,7 @@ static String const &nameForPathGroup(FS1::PathGroup group) "Default", "Fallback" }; - DENG_ASSERT(int(group) >= FS1::OverridePaths && int(group) <= FS1::FallbackPaths); + DE_ASSERT(int(group) >= FS1::OverridePaths && int(group) <= FS1::FallbackPaths); return names[int(group)]; } @@ -442,7 +442,7 @@ bool FS1::Scheme::addSearchPath(SearchPath const &search, FS1::PathGroup group) d->nameHashIsDirty = true; // Have we seen this path already (we don't want duplicates)? - DENG2_FOR_EACH(SearchPaths, i, d->searchPaths) + DE_FOR_EACH(SearchPaths, i, d->searchPaths) { // Compare using the unresolved textual representations. if (!i->asText().compareWithoutCase(search.asText())) @@ -526,7 +526,7 @@ bool FS1::Scheme::mapPath(String &path) const return true; } -#ifdef DENG_DEBUG +#ifdef DE_DEBUG void FS1::Scheme::debugPrint() const { LOG_AS("Scheme::debugPrint"); diff --git a/doomsday/apps/libdoomsday/src/filesys/fs_util.cpp b/doomsday/apps/libdoomsday/src/filesys/fs_util.cpp index fd9aa80018..59d34ddb5e 100644 --- a/doomsday/apps/libdoomsday/src/filesys/fs_util.cpp +++ b/doomsday/apps/libdoomsday/src/filesys/fs_util.cpp @@ -22,7 +22,7 @@ * 02110-1301 USA */ -#define DENG_NO_API_MACROS_FILESYS +#define DE_NO_API_MACROS_FILESYS #ifdef WIN32 # include @@ -133,7 +133,7 @@ dd_bool F_MakePath(char const *path) Str_Init(&buf); do { - endptr = strchr(ptr, DENG_DIR_SEP_CHAR); + endptr = strchr(ptr, DE_DIR_SEP_CHAR); if (!endptr) Str_Append(&buf, ptr); else @@ -147,7 +147,7 @@ dd_bool F_MakePath(char const *path) mkdir(Str_Text(&buf), 0775); #endif } - Str_AppendChar(&buf, DENG_DIR_SEP_CHAR); + Str_AppendChar(&buf, DE_DIR_SEP_CHAR); ptr = endptr + 1; } while (NULL != endptr); @@ -238,7 +238,7 @@ dd_bool F_ToNativeSlashes(ddstring_t* dstStr, const ddstring_t* srcStr) for (i = 0; src[i]; ++i) { - if (src[i] != DENG_DIR_WRONG_SEP_CHAR) + if (src[i] != DE_DIR_WRONG_SEP_CHAR) { if (dstStr != srcStr) Str_AppendChar(dstStr, src[i]); @@ -246,9 +246,9 @@ dd_bool F_ToNativeSlashes(ddstring_t* dstStr, const ddstring_t* srcStr) } if (dstStr != srcStr) - Str_AppendChar(dstStr, DENG_DIR_SEP_CHAR); + Str_AppendChar(dstStr, DE_DIR_SEP_CHAR); else - dst[i] = DENG_DIR_SEP_CHAR; + dst[i] = DE_DIR_SEP_CHAR; result = true; } } @@ -260,7 +260,7 @@ dd_bool F_ToNativeSlashes(ddstring_t* dstStr, const ddstring_t* srcStr) */ static bool F_IsRelativeToBase(char const *path, char const *base) { - DENG_ASSERT(path != 0 && base != 0); + DE_ASSERT(path != 0 && base != 0); return !qstrnicmp(path, base, strlen(base)); } @@ -274,7 +274,7 @@ static bool F_IsRelativeToBase(char const *path, char const *base) */ static dd_bool F_RemoveBasePath(ddstring_t *dst, ddstring_t const *absPath) { - DENG_ASSERT(dst != 0 && absPath != 0); + DE_ASSERT(dst != 0 && absPath != 0); ddstring_t basePath; Str_InitStatic(&basePath, DoomsdayApp::app().doomsdayBasePath().c_str()); @@ -312,7 +312,7 @@ dd_bool F_IsAbsolute(const ddstring_t* str) if (!str) return false; /// @todo Should not handle both separators - refactor callers. - if (Str_At(str, 0) == DENG_DIR_SEP_CHAR || Str_At(str, 0) == DENG_DIR_WRONG_SEP_CHAR || Str_At(str, 1) == ':') + if (Str_At(str, 0) == DE_DIR_SEP_CHAR || Str_At(str, 0) == DE_DIR_WRONG_SEP_CHAR || Str_At(str, 1) == ':') return true; #ifdef UNIX if (Str_At(str, 0) == '~') @@ -453,7 +453,7 @@ const char* F_PrettyPath(const char* path) } // Swap directory separators with their system-specific version. - if (strchr(path, DENG_DIR_WRONG_SEP_CHAR)) + if (strchr(path, DE_DIR_WRONG_SEP_CHAR)) { int i; if (!buf) @@ -463,8 +463,8 @@ const char* F_PrettyPath(const char* path) } for (i = 0; i < len; ++i) { - if (buf->str[i] == DENG_DIR_WRONG_SEP_CHAR) - buf->str[i] = DENG_DIR_SEP_CHAR; + if (buf->str[i] == DE_DIR_WRONG_SEP_CHAR) + buf->str[i] = DE_DIR_SEP_CHAR; } path = Str_Text(buf); } @@ -477,7 +477,7 @@ const char* F_PrettyPath(const char* path) /* dd_bool F_Dump(void const *data, size_t size, char const *path) { - DENG2_ASSERT(data != 0 && path != 0); + DE_ASSERT(data != 0 && path != 0); if (!size) return false; diff --git a/doomsday/apps/libdoomsday/src/filesys/idgameslink.cpp b/doomsday/apps/libdoomsday/src/filesys/idgameslink.cpp index 5135bddc68..4235eb12d9 100644 --- a/doomsday/apps/libdoomsday/src/filesys/idgameslink.cpp +++ b/doomsday/apps/libdoomsday/src/filesys/idgameslink.cpp @@ -36,7 +36,7 @@ static String const CATEGORY_MUSIC ("music"); static String const CATEGORY_SOUNDS("sounds"); static String const CATEGORY_THEMES("themes"); -DENG2_PIMPL(IdgamesLink) +DE_PIMPL(IdgamesLink) { struct PackageIndexEntry : public PathTree::Node { @@ -276,12 +276,12 @@ filesys::Link *IdgamesLink::construct(String const &address) File *IdgamesLink::populateRemotePath(String const &packageId, filesys::RepositoryPath const &path) const { - DENG2_ASSERT(path.link == this); + DE_ASSERT(path.link == this); auto *pkgEntry = d->findPackage(packageId); if (!pkgEntry) { - DENG2_ASSERT(pkgEntry); + DE_ASSERT(pkgEntry); return nullptr; } diff --git a/doomsday/apps/libdoomsday/src/filesys/idgamespackageinfofile.cpp b/doomsday/apps/libdoomsday/src/filesys/idgamespackageinfofile.cpp index 1ab15a15d8..00b0dabad7 100644 --- a/doomsday/apps/libdoomsday/src/filesys/idgamespackageinfofile.cpp +++ b/doomsday/apps/libdoomsday/src/filesys/idgamespackageinfofile.cpp @@ -31,8 +31,8 @@ using namespace de; -DENG2_PIMPL(IdgamesPackageInfoFile) -, DENG2_OBSERVES(Asset, StateChange) +DE_PIMPL(IdgamesPackageInfoFile) +, DE_OBSERVES(Asset, StateChange) { Asset packageAsset; AssetGroup assets; @@ -58,8 +58,8 @@ DENG2_PIMPL(IdgamesPackageInfoFile) // Looks like we can process the file contents. qDebug() << "[IdgamesPackageInfoFile] Time to unzip and analyze!"; - DENG2_ASSERT(dataFile->isReady()); - DENG2_ASSERT(descriptionFile->isReady()); + DE_ASSERT(dataFile->isReady()); + DE_ASSERT(descriptionFile->isReady()); // We need to extract data files (WAD, DEH) so that they can be loaded. /// @todo No need for this after FS2 used for loading everything. @@ -194,7 +194,7 @@ DENG2_PIMPL(IdgamesPackageInfoFile) } // Everythis is complete. - DENG2_FOR_PUBLIC_AUDIENCE(Download, i) + DE_FOR_PUBLIC_AUDIENCE(Download, i) { i->downloadProgress(self(), 0); } diff --git a/doomsday/apps/libdoomsday/src/filesys/lumpcache.cpp b/doomsday/apps/libdoomsday/src/filesys/lumpcache.cpp index 48b6d425e6..63c0b03365 100644 --- a/doomsday/apps/libdoomsday/src/filesys/lumpcache.cpp +++ b/doomsday/apps/libdoomsday/src/filesys/lumpcache.cpp @@ -174,7 +174,7 @@ LumpCache &LumpCache::clear() { if (_dataCache) { - DENG2_FOR_EACH(DataCache, i, *_dataCache) + DE_FOR_EACH(DataCache, i, *_dataCache) { i->clearData(); } diff --git a/doomsday/apps/libdoomsday/src/filesys/lumpindex.cpp b/doomsday/apps/libdoomsday/src/filesys/lumpindex.cpp index 7e6249998a..cf3233d346 100644 --- a/doomsday/apps/libdoomsday/src/filesys/lumpindex.cpp +++ b/doomsday/apps/libdoomsday/src/filesys/lumpindex.cpp @@ -60,7 +60,7 @@ namespace internal using namespace internal; -DENG2_PIMPL_NOREF(LumpIndex::Id1MapRecognizer) +DE_PIMPL_NOREF(LumpIndex::Id1MapRecognizer) { lumpnum_t lastLump = -1; Lumps lumps; @@ -150,7 +150,7 @@ LumpIndex::Id1MapRecognizer::Id1MapRecognizer(LumpIndex const &lumpIndex, lumpnu // Determine whether each data lump is of the expected size. duint numVertexes = 0, numThings = 0, numLines = 0, numSides = 0, numSectors = 0, numLights = 0; - DENG2_FOR_EACH_CONST(Lumps, i, d->lumps) + DE_FOR_EACH_CONST(Lumps, i, d->lumps) { DataType const dataType = i.key(); File1 const &lump = *i.value(); @@ -318,7 +318,7 @@ dsize LumpIndex::Id1MapRecognizer::elementSizeForDataType(Format mapFormat, Data } } -DENG2_PIMPL(LumpIndex) +DE_PIMPL(LumpIndex) { bool pathsAreUnique; @@ -350,7 +350,7 @@ DENG2_PIMPL(LumpIndex) lumpsByPath.reset(new PathHash(numElements)); // Clear the chains. - DENG2_FOR_EACH(PathHash, i, *lumpsByPath) + DE_FOR_EACH(PathHash, i, *lumpsByPath) { i->head = -1; } @@ -378,7 +378,7 @@ DENG2_PIMPL(LumpIndex) */ int flagContainedLumps(QBitArray &pruneFlags, File1 &file) { - DENG2_ASSERT(pruneFlags.size() == lumps.size()); + DE_ASSERT(pruneFlags.size() == lumps.size()); int const numRecords = lumps.size(); int numFlagged = 0; @@ -399,7 +399,7 @@ DENG2_PIMPL(LumpIndex) */ int flagDuplicateLumps(QBitArray &pruneFlags) { - DENG2_ASSERT(pruneFlags.size() == lumps.size()); + DE_ASSERT(pruneFlags.size() == lumps.size()); // Any work to do? if (!pathsAreUnique) return 0; @@ -440,7 +440,7 @@ DENG2_PIMPL(LumpIndex) /// @return Number of pruned lumps. int pruneFlaggedLumps(QBitArray flaggedLumps) { - DENG2_ASSERT(flaggedLumps.size() == lumps.size()); + DE_ASSERT(flaggedLumps.size() == lumps.size()); // Have we lumps to prune? int const numFlaggedForPrune = flaggedLumps.count(true); @@ -596,7 +596,7 @@ bool LumpIndex::catalogues(File1 &file) { d->pruneDuplicatesIfNeeded(); - DENG2_FOR_EACH(Lumps, i, d->lumps) + DE_FOR_EACH(Lumps, i, d->lumps) { File1 const &lump = **i; if (&lump.container() == &file) @@ -623,7 +623,7 @@ int LumpIndex::findAll(Path const &path, FoundIndices &found) const d->buildLumpsByPathIfNeeded(); // Perform the search. - DENG2_ASSERT(!d->lumpsByPath.isNull()); + DE_ASSERT(!d->lumpsByPath.isNull()); ushort hash = path.lastSegment().hash() % d->lumpsByPath->size(); for (int idx = (*d->lumpsByPath)[hash].head; idx != -1; idx = (*d->lumpsByPath)[idx].nextInLoadOrder) @@ -648,7 +648,7 @@ lumpnum_t LumpIndex::findLast(Path const &path) const d->buildLumpsByPathIfNeeded(); // Perform the search. - DENG2_ASSERT(!d->lumpsByPath.isNull()); + DE_ASSERT(!d->lumpsByPath.isNull()); ushort hash = path.lastSegment().hash() % d->lumpsByPath->size(); for (int idx = (*d->lumpsByPath)[hash].head; idx != -1; idx = (*d->lumpsByPath)[idx].nextInLoadOrder) @@ -675,7 +675,7 @@ lumpnum_t LumpIndex::findFirst(Path const &path) const lumpnum_t earliest = -1; // Not found. // Perform the search. - DENG2_ASSERT(!d->lumpsByPath.isNull()); + DE_ASSERT(!d->lumpsByPath.isNull()); ushort hash = path.lastSegment().hash() % d->lumpsByPath->size(); for (int idx = (*d->lumpsByPath)[hash].head; idx != -1; idx = (*d->lumpsByPath)[idx].nextInLoadOrder) diff --git a/doomsday/apps/libdoomsday/src/filesys/readfile.cpp b/doomsday/apps/libdoomsday/src/filesys/readfile.cpp index ed903d3f59..3347a63f3a 100644 --- a/doomsday/apps/libdoomsday/src/filesys/readfile.cpp +++ b/doomsday/apps/libdoomsday/src/filesys/readfile.cpp @@ -245,7 +245,7 @@ static size_t FileReader(const char* name, char** buffer) } buf = (char *) Z_Malloc(length, PU_APPSTATIC, 0); - DENG_ASSERT(buf != 0); + DE_ASSERT(buf != 0); size_t bytesRead = read(handle, buf, length); close(handle); diff --git a/doomsday/apps/libdoomsday/src/filesys/virtualmappings.cpp b/doomsday/apps/libdoomsday/src/filesys/virtualmappings.cpp index f2964c1afd..c6f5fc5030 100644 --- a/doomsday/apps/libdoomsday/src/filesys/virtualmappings.cpp +++ b/doomsday/apps/libdoomsday/src/filesys/virtualmappings.cpp @@ -62,7 +62,7 @@ void FS_InitVirtualPathMappings() /// Skip all whitespace except newlines. static inline char const *skipSpace(char const *ptr) { - DENG2_ASSERT(ptr != 0); + DE_ASSERT(ptr != 0); while (*ptr && *ptr != '\n' && isspace(*ptr)) { ptr++; } return ptr; @@ -70,7 +70,7 @@ static inline char const *skipSpace(char const *ptr) static bool parsePathLumpMapping(char lumpName[9/*LUMPNAME_T_MAXLEN*/], ddstring_t *path, char const *buffer) { - DENG2_ASSERT(lumpName != 0 && path != 0); + DE_ASSERT(lumpName != 0 && path != 0); // Find the start of the lump name. char const *ptr = skipSpace(buffer); @@ -109,7 +109,7 @@ static bool parsePathLumpMapping(char lumpName[9/*LUMPNAME_T_MAXLEN*/], ddstring */ static bool parsePathLumpMappings(char const *buffer) { - DENG2_ASSERT(buffer != 0); + DE_ASSERT(buffer != 0); bool successful = false; ddstring_t path; Str_Init(&path); @@ -157,7 +157,7 @@ void FS_InitPathLumpMappings() LumpIndex const &lumpIndex = App_FileSystem().nameIndex(); LumpIndex::FoundIndices foundDirecs; lumpIndex.findAll("DD_DIREC.lmp", foundDirecs); - DENG2_FOR_EACH_CONST(LumpIndex::FoundIndices, i, foundDirecs) // in load order + DE_FOR_EACH_CONST(LumpIndex::FoundIndices, i, foundDirecs) // in load order { File1 &lump = lumpIndex[*i]; FileInfo const &lumpInfo = lump.info(); diff --git a/doomsday/apps/libdoomsday/src/filesys/wad.cpp b/doomsday/apps/libdoomsday/src/filesys/wad.cpp index 52d20d4abd..a5976f9f99 100644 --- a/doomsday/apps/libdoomsday/src/filesys/wad.cpp +++ b/doomsday/apps/libdoomsday/src/filesys/wad.cpp @@ -35,7 +35,7 @@ namespace internal { struct FileHeader { - DENG2_ERROR(ReadError); + DE_ERROR(ReadError); Block identification; // 4 bytes dint32 lumpRecordsCount; @@ -55,7 +55,7 @@ struct FileHeader struct IndexEntry { - DENG2_ERROR(ReadError); + DE_ERROR(ReadError); dint32 offset; dint32 size; @@ -173,7 +173,7 @@ Wad &Wad::LumpFile::wad() const return container().as(); } -DENG2_PIMPL_NOREF(Wad) +DE_PIMPL_NOREF(Wad) { LumpTree entries; ///< Directory structure and entry records for all lumps. QScopedPointer dataCache; ///< Data payload cache. @@ -389,7 +389,7 @@ Wad::LumpTree const &Wad::lumpTree() const Wad::LumpFile &Wad::Entry::file() const { - DENG2_ASSERT(!lumpFile.isNull()); + DE_ASSERT(!lumpFile.isNull()); return *lumpFile; } diff --git a/doomsday/apps/libdoomsday/src/filesys/zip.cpp b/doomsday/apps/libdoomsday/src/filesys/zip.cpp index 594731dde0..1f96650152 100644 --- a/doomsday/apps/libdoomsday/src/filesys/zip.cpp +++ b/doomsday/apps/libdoomsday/src/filesys/zip.cpp @@ -255,7 +255,7 @@ static bool applyGamePathMappings(String &path) // Key-named directories in the root might be mapped to another location. FS1::Schemes const &schemes = App_FileSystem().allSchemes(); - DENG2_FOR_EACH_CONST(FS1::Schemes, i, schemes) + DE_FOR_EACH_CONST(FS1::Schemes, i, schemes) { if ((*i)->mapPath(path)) { @@ -316,7 +316,7 @@ Zip &Zip::LumpFile::zip() const return container().as(); } -DENG2_PIMPL(Zip) +DE_PIMPL(Zip) { LumpTree entries; ///< Directory structure and entry records for all lumps. QScopedPointer dataCache; ///< Data payload cache. @@ -330,7 +330,7 @@ DENG2_PIMPL(Zip) */ size_t bufferLump(LumpFile const &lump, uint8_t *buffer) { - DENG2_ASSERT(buffer); + DE_ASSERT(buffer); LOG_AS("Zip"); FileInfo const &lumpInfo = lump.info(); @@ -690,7 +690,7 @@ uint8_t *Zip::compressAtLevel(uint8_t *in, size_t inSize, size_t *outSize, int l int result; int have; - DENG2_ASSERT(outSize); + DE_ASSERT(outSize); *outSize = 0; std::memset(&stream, 0, sizeof(stream)); @@ -743,8 +743,8 @@ uint8_t *Zip::compressAtLevel(uint8_t *in, size_t inSize, size_t *outSize, int l } } while (!stream.avail_out); // output chunk full, more data may follow - DENG2_ASSERT(result == Z_STREAM_END); - DENG2_ASSERT(stream.total_out == *outSize); + DE_ASSERT(result == Z_STREAM_END); + DE_ASSERT(stream.total_out == *outSize); deflateEnd(&stream); return output; @@ -765,7 +765,7 @@ uint8_t *Zip::uncompress(uint8_t *in, size_t inSize, size_t *outSize) int result; int have; - DENG2_ASSERT(outSize); + DE_ASSERT(outSize); *outSize = 0; std::memset(&stream, 0, sizeof(stream)); @@ -808,7 +808,7 @@ uint8_t *Zip::uncompress(uint8_t *in, size_t inSize, size_t *outSize) } while (!stream.avail_out); // output chunk full, more data may follow // We should now be at the end. - DENG2_ASSERT(result == Z_STREAM_END); + DE_ASSERT(result == Z_STREAM_END); inflateEnd(&stream); return output; @@ -857,7 +857,7 @@ Zip::LumpTree const &Zip::lumpTree() const Zip::LumpFile &Zip::Entry::file() const { - DENG2_ASSERT(!lumpFile.isNull()); + DE_ASSERT(!lumpFile.isNull()); return *lumpFile; } diff --git a/doomsday/apps/libdoomsday/src/game.cpp b/doomsday/apps/libdoomsday/src/game.cpp index 8f9ddca150..891cb2c8fa 100644 --- a/doomsday/apps/libdoomsday/src/game.cpp +++ b/doomsday/apps/libdoomsday/src/game.cpp @@ -60,7 +60,7 @@ String const Game::DEF_LEGACYSAVEGAME_SUBFOLDER("legacySavegame.subfolder"); String const Game::DEF_MAPINFO_PATH("mapInfoPath"); String const Game::DEF_OPTIONS("options"); -DENG2_PIMPL(Game), public Lockable +DE_PIMPL(Game), public Lockable { pluginid_t pluginId = 0; ///< Unique identifier of the registering plugin. Record params; @@ -484,7 +484,7 @@ void Game::addResource(resourceclassid_t classId, dint rflags, GameProfile &Game::profile() const { DENG2_GUARD(d); - DENG2_ASSERT(d->profile()); // all games have a matching built-in profile + DE_ASSERT(d->profile()); // all games have a matching built-in profile return *d->profile(); } @@ -561,7 +561,7 @@ void Game::printFiles(Game const &game, int rflags, bool printStatus) D_CMD(InspectGame) { - DENG2_UNUSED(src); + DE_UNUSED(src); Game const *game = 0; if (argc < 2) @@ -588,7 +588,7 @@ D_CMD(InspectGame) } } - DENG2_ASSERT(!game->isNull()); + DE_ASSERT(!game->isNull()); LOG_MSG("") << game->description(); diff --git a/doomsday/apps/libdoomsday/src/game_init.cpp b/doomsday/apps/libdoomsday/src/game_init.cpp index c598cc55aa..6e4d6fc40f 100644 --- a/doomsday/apps/libdoomsday/src/game_init.cpp +++ b/doomsday/apps/libdoomsday/src/game_init.cpp @@ -42,7 +42,7 @@ using namespace de; static void updateProgress(int progress) { - DENG2_FOR_EACH_OBSERVER(Games::ProgressAudience, i, + DE_FOR_EACH_OBSERVER(Games::ProgressAudience, i, DoomsdayApp::games().audienceForProgress()) { i->gameWorkerProgress(progress); @@ -92,7 +92,7 @@ namespace de { // Helper function for accessing files via the legacy FS1. static void forNativeDataFiles(DataBundle const &bundle, std::function func) { - DENG2_ASSERT(bundle.isLinkedAsPackage()); // couldn't be accessed otherwise + DE_ASSERT(bundle.isLinkedAsPackage()); // couldn't be accessed otherwise switch (bundle.format()) { @@ -213,7 +213,7 @@ bool File1::tryUnload(DataBundle const &bundle) static void loadResource(ResourceManifest &manifest) { - DENG2_ASSERT(manifest.resourceClass() == RC_PACKAGE); + DE_ASSERT(manifest.resourceClass() == RC_PACKAGE); de::Uri path(manifest.resolvedPath(false/*do not locate resource*/), RC_NULL); if (path.isEmpty()) return; @@ -350,7 +350,7 @@ static dint findAllGameDataPaths(FS1::PathList &found) dint const numFoundSoFar = found.count(); for (String const &ext : extensions) { - DENG2_ASSERT(!ext.isEmpty()); + DE_ASSERT(!ext.isEmpty()); String const searchPath = de::Uri(Path("$(App.DataPath)/$(GamePlugin.Name)/auto/*." + ext)).resolved(); App_FileSystem().findAllPaths(searchPath, 0, found); } @@ -368,7 +368,7 @@ static dint loadFilesFromDataGameAuto() findAllGameDataPaths(found); dint numLoaded = 0; - DENG2_FOR_EACH_CONST(FS1::PathList, i, found) + DE_FOR_EACH_CONST(FS1::PathList, i, found) { // Ignore directories. if (i->attrib & A_SUBDIR) continue; @@ -427,7 +427,7 @@ int loadAddonResourcesBusyWorker(void *context) FS1::PathList found; findAllGameDataPaths(found); - DENG2_FOR_EACH_CONST(FS1::PathList, i, found) + DE_FOR_EACH_CONST(FS1::PathList, i, found) { // Ignore directories. if (i->attrib & A_SUBDIR) continue; diff --git a/doomsday/apps/libdoomsday/src/gameprofiles.cpp b/doomsday/apps/libdoomsday/src/gameprofiles.cpp index 9b225daa87..0895cdcbd7 100644 --- a/doomsday/apps/libdoomsday/src/gameprofiles.cpp +++ b/doomsday/apps/libdoomsday/src/gameprofiles.cpp @@ -46,8 +46,8 @@ static int const DEFAULT_SKILL = 3; // Normal skill level (1-5) static GameProfile nullGameProfile; -DENG2_PIMPL(GameProfiles) -, DENG2_OBSERVES(Games, Addition) +DE_PIMPL(GameProfiles) +, DE_OBSERVES(Games, Addition) { Impl(Public *i) : Base(i) {} @@ -212,7 +212,7 @@ Profiles::AbstractProfile *GameProfiles::profileFromInfoBlock(Info::BlockElement //------------------------------------------------------------------------------------------------- -DENG2_PIMPL_NOREF(GameProfiles::Profile) +DE_PIMPL_NOREF(GameProfiles::Profile) { String gameId; String customDataFile; diff --git a/doomsday/apps/libdoomsday/src/games.cpp b/doomsday/apps/libdoomsday/src/games.cpp index 1eb7d6fe99..d3292e07d2 100644 --- a/doomsday/apps/libdoomsday/src/games.cpp +++ b/doomsday/apps/libdoomsday/src/games.cpp @@ -38,8 +38,8 @@ using namespace de; -DENG2_PIMPL(Games) -, DENG2_OBSERVES(res::Bundles, Identify) +DE_PIMPL(Games) +, DE_OBSERVES(res::Bundles, Identify) { /// The actual collection. All games; @@ -55,7 +55,7 @@ DENG2_PIMPL(Games) /** * Delegates game addition notifications to scripts. */ - class GameAdditionScriptAudience : DENG2_OBSERVES(Games, Addition) + class GameAdditionScriptAudience : DE_OBSERVES(Games, Addition) { public: void gameAdded(Game &game) @@ -91,7 +91,7 @@ DENG2_PIMPL(Games) void clear() { - DENG2_ASSERT(nullGame != 0); + DE_ASSERT(nullGame != 0); qDeleteAll(games); games.clear(); @@ -100,14 +100,14 @@ DENG2_PIMPL(Games) void add(Game *game) { - DENG2_ASSERT(game != nullptr); + DE_ASSERT(game != nullptr); games.push_back(game); idLookup.insert(game->id().toLower(), game); DoomsdayApp::bundles().audienceForIdentify() += this; - DENG2_FOR_PUBLIC_AUDIENCE2(Addition, i) + DE_FOR_PUBLIC_AUDIENCE2(Addition, i) { i->gameAdded(*game); } @@ -137,14 +137,14 @@ DENG2_PIMPL(Games) } } - DENG2_PIMPL_AUDIENCE(Addition) - DENG2_PIMPL_AUDIENCE(Readiness) - DENG2_PIMPL_AUDIENCE(Progress) + DE_PIMPL_AUDIENCE(Addition) + DE_PIMPL_AUDIENCE(Readiness) + DE_PIMPL_AUDIENCE(Progress) }; -DENG2_AUDIENCE_METHOD(Games, Addition) -DENG2_AUDIENCE_METHOD(Games, Readiness) -DENG2_AUDIENCE_METHOD(Games, Progress) +DE_AUDIENCE_METHOD(Games, Addition) +DE_AUDIENCE_METHOD(Games, Readiness) +DE_AUDIENCE_METHOD(Games, Progress) Games::Games() : d(new Impl(this)) {} @@ -324,7 +324,7 @@ void Games::checkReadiness() locateStartupResources(game); Games &self = *this; // MSVC 2013 cannot figure it out inside the lambda... - DENG2_FOR_EACH_OBSERVER(ProgressAudience, i, self().audienceForProgress()) + DE_FOR_EACH_OBSERVER(ProgressAudience, i, self().audienceForProgress()) { i->gameWorkerProgress(n * 200 / count() - 1); } @@ -333,7 +333,7 @@ void Games::checkReadiness() LOG_RES_VERBOSE(_E(l) " IdentityKey: " _E(.)_E(>)) << game.id(); Game::printFiles(game, FF_STARTUP); - LOG_RES_MSG(" " DENG2_CHAR_RIGHT_DOUBLEARROW " ") << game.statusAsText(); + LOG_RES_MSG(" " DE_CHAR_RIGHT_DOUBLEARROW " ") << game.statusAsText(); ++n; return 0; @@ -351,7 +351,7 @@ void Games::checkReadiness() // Only notify when the set of playable games changes. if (playable != d->lastCheckedPlayable) { - DENG2_FOR_AUDIENCE2(Readiness, i) + DE_FOR_AUDIENCE2(Readiness, i) { i->gameReadinessUpdated(); } @@ -375,7 +375,7 @@ void Games::checkReadiness() D_CMD(ListGames) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); Games &games = DoomsdayApp::games(); if (!games.count()) @@ -398,7 +398,7 @@ D_CMD(ListGames) String list; int numCompleteGames = 0; - DENG2_FOR_EACH_CONST(Games::GameList, i, found) + DE_FOR_EACH_CONST(Games::GameList, i, found) { Game *game = i->game; bool isCurrent = (&DoomsdayApp::game() == game); diff --git a/doomsday/apps/libdoomsday/src/gamestatefolder.cpp b/doomsday/apps/libdoomsday/src/gamestatefolder.cpp index 29e89c82fa..3631f3d7e5 100644 --- a/doomsday/apps/libdoomsday/src/gamestatefolder.cpp +++ b/doomsday/apps/libdoomsday/src/gamestatefolder.cpp @@ -57,7 +57,7 @@ static Value *makeValueFromInfoValue(de::Info::Element::Value const &v) } } -DENG2_PIMPL(GameStateFolder) +DE_PIMPL(GameStateFolder) { Metadata metadata; ///< Cached. bool needCacheMetadata; @@ -98,10 +98,10 @@ DENG2_PIMPL(GameStateFolder) return 0; } - DENG2_PIMPL_AUDIENCE(MetadataChange) + DE_PIMPL_AUDIENCE(MetadataChange) }; -DENG2_AUDIENCE_METHOD(GameStateFolder, MetadataChange) +DE_AUDIENCE_METHOD(GameStateFolder, MetadataChange) GameStateFolder::GameStateFolder(File &sourceArchiveFile, String const &name) : ArchiveFolder(sourceArchiveFile, name) @@ -110,7 +110,7 @@ GameStateFolder::GameStateFolder(File &sourceArchiveFile, String const &name) GameStateFolder::~GameStateFolder() { - DENG2_FOR_AUDIENCE2(Deletion, i) i->fileBeingDeleted(*this); + DE_FOR_AUDIENCE2(Deletion, i) i->fileBeingDeleted(*this); audienceForDeletion().clear(); deindex(); //Session::savedIndex().remove(path()); @@ -152,7 +152,7 @@ void GameStateFolder::cacheMetadata(Metadata const &copied) { d->metadata = copied; d->needCacheMetadata = false; - DENG2_FOR_AUDIENCE2(MetadataChange, i) + DE_FOR_AUDIENCE2(MetadataChange, i) { i->gameStateFolderMetadataChanged(*this); } @@ -226,7 +226,7 @@ File *GameStateFolder::Interpreter::interpretFile(File *sourceData) const //--------------------------------------------------------------------------------------- -DENG2_PIMPL_NOREF(GameStateFolder::MapStateReader) +DE_PIMPL_NOREF(GameStateFolder::MapStateReader) { GameStateFolder const *session; ///< Saved session being read. Not owned. @@ -431,7 +431,7 @@ String GameStateFolder::Metadata::asInfo() const { os << "\nplayers <"; ArrayValue const &playersArray = geta("players"); - DENG2_FOR_EACH_CONST(ArrayValue::Elements, i, playersArray.elements()) + DE_FOR_EACH_CONST(ArrayValue::Elements, i, playersArray.elements()) { Value const *value = *i; if (i != playersArray.elements().begin()) os << ", "; @@ -451,7 +451,7 @@ String GameStateFolder::Metadata::asInfo() const os << "\n" << BLOCK_GROUP << " ruleset {"; Record const &rules = subrecord("gameRules"); - DENG2_FOR_EACH_CONST(Record::Members, i, rules.members()) + DE_FOR_EACH_CONST(Record::Members, i, rules.members()) { Value const &value = i.value()->value(); String valueAsText = value.asText(); diff --git a/doomsday/apps/libdoomsday/src/help.cpp b/doomsday/apps/libdoomsday/src/help.cpp index 3075de911e..1cf46d7a65 100644 --- a/doomsday/apps/libdoomsday/src/help.cpp +++ b/doomsday/apps/libdoomsday/src/help.cpp @@ -178,7 +178,7 @@ void DD_ShutdownHelp() D_CMD(LoadHelp) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); DD_ShutdownHelp(); DD_InitHelp(); diff --git a/doomsday/apps/libdoomsday/src/player.cpp b/doomsday/apps/libdoomsday/src/player.cpp index 10cd6e3b1d..ec0e4fa783 100644 --- a/doomsday/apps/libdoomsday/src/player.cpp +++ b/doomsday/apps/libdoomsday/src/player.cpp @@ -21,7 +21,7 @@ using namespace de; -DENG2_PIMPL_NOREF(Player) +DE_PIMPL_NOREF(Player) { World *world = nullptr; ddplayer_t publicData; diff --git a/doomsday/apps/libdoomsday/src/players.cpp b/doomsday/apps/libdoomsday/src/players.cpp index 6666d6fcd7..1c49e87cc1 100644 --- a/doomsday/apps/libdoomsday/src/players.cpp +++ b/doomsday/apps/libdoomsday/src/players.cpp @@ -21,7 +21,7 @@ using namespace de; -DENG2_PIMPL_NOREF(Players) +DE_PIMPL_NOREF(Players) { Player *players[DDMAXPLAYERS]; @@ -45,14 +45,14 @@ Players::Players(Constructor playerConstructor) : d(new Impl) for (auto &plr : d->players) { plr = playerConstructor(); - DENG2_ASSERT(is(plr)); + DE_ASSERT(is(plr)); } } Player &Players::at(int index) const { - DENG2_ASSERT(index >= 0); - DENG2_ASSERT(index < DDMAXPLAYERS); + DE_ASSERT(index >= 0); + DE_ASSERT(index < DDMAXPLAYERS); return *d->players[index]; } diff --git a/doomsday/apps/libdoomsday/src/plugins.cpp b/doomsday/apps/libdoomsday/src/plugins.cpp index f2800949a1..2383a1fed2 100644 --- a/doomsday/apps/libdoomsday/src/plugins.cpp +++ b/doomsday/apps/libdoomsday/src/plugins.cpp @@ -36,8 +36,8 @@ struct ThreadState ThreadState() : currentPlugin(0) {} }; -#ifndef DENG2_QT_4_8_OR_NEWER // Qt 4.7 requires a pointer as the local data type -# define DENG_LOCAL_DATA_POINTER +#ifndef DE_QT_4_8_OR_NEWER // Qt 4.7 requires a pointer as the local data type +# define DE_LOCAL_DATA_POINTER QThreadStorage pluginState; ///< Thread-local plugin state. void initLocalData() { if (!pluginState.hasLocalData()) pluginState.setLocalData(new ThreadState); @@ -72,7 +72,7 @@ pluginid_t Plugins::Hook::pluginId() const return _pluginId; } -DENG2_PIMPL_NOREF(Plugins) +DE_PIMPL_NOREF(Plugins) { void *(*getGameAPI)(char const *) = nullptr; GameExports gameExports; @@ -106,13 +106,13 @@ DENG2_PIMPL_NOREF(Plugins) { typedef void (*PluginInitializer)(void); -#if !defined (DENG_STATIC_LINK) +#if !defined (DE_STATIC_LINK) // We are only interested in native files. if (!is(lib.source())) return 0; // Continue iteration. #endif - DENG2_ASSERT(!lib.path().isEmpty()); + DE_ASSERT(!lib.path().isEmpty()); if (strcasestr("/bin/audio_", lib.path().toUtf8().constData())) { // Do not touch audio plugins at this point. @@ -179,7 +179,7 @@ DENG2_PIMPL_NOREF(Plugins) bool unloadPlugin(PluginHandle *handle) { - DENG2_ASSERT(handle != nullptr); + DE_ASSERT(handle != nullptr); if (!*handle) return false; Library_Delete(*handle); @@ -189,7 +189,7 @@ DENG2_PIMPL_NOREF(Plugins) void setActivePluginId(pluginid_t id) { -#ifdef DENG_LOCAL_DATA_POINTER +#ifdef DE_LOCAL_DATA_POINTER initLocalData(); pluginState.localData()->currentPlugin = id; #else @@ -199,7 +199,7 @@ DENG2_PIMPL_NOREF(Plugins) pluginid_t activePluginId() const { -#ifdef DENG_LOCAL_DATA_POINTER +#ifdef DE_LOCAL_DATA_POINTER initLocalData(); return pluginState.localData()->currentPlugin; #else @@ -207,19 +207,19 @@ DENG2_PIMPL_NOREF(Plugins) #endif } - DENG2_PIMPL_AUDIENCE(PublishAPI) - DENG2_PIMPL_AUDIENCE(Notification) + DE_PIMPL_AUDIENCE(PublishAPI) + DE_PIMPL_AUDIENCE(Notification) }; -DENG2_AUDIENCE_METHOD(Plugins, PublishAPI) -DENG2_AUDIENCE_METHOD(Plugins, Notification) +DE_AUDIENCE_METHOD(Plugins, PublishAPI) +DE_AUDIENCE_METHOD(Plugins, Notification) Plugins::Plugins() : d(new Impl) {} void Plugins::publishAPIs(::Library *lib) { - DENG2_FOR_AUDIENCE2(PublishAPI, i) + DE_FOR_AUDIENCE2(PublishAPI, i) { i->publishAPIToPlugin(lib); } @@ -227,7 +227,7 @@ void Plugins::publishAPIs(::Library *lib) void Plugins::notify(int notification, void *data) { - DENG2_FOR_AUDIENCE2(Notification, i) + DE_FOR_AUDIENCE2(Notification, i) { i->pluginSentNotification(notification, data); } @@ -263,14 +263,14 @@ void Plugins::setActivePluginId(pluginid_t id) LibraryFile const &Plugins::fileForPlugin(pluginid_t id) const { - DENG2_ASSERT(id > 0 && id <= MAX_PLUGS); + DE_ASSERT(id > 0 && id <= MAX_PLUGS); return Library_File(d->hInstPlug[id - 1]); } void *Plugins::findEntryPoint(pluginid_t pluginId, char const *fn) const { int const plugIndex = pluginId - 1; - DENG2_ASSERT(plugIndex >= 0 && plugIndex < MAX_PLUGS); + DE_ASSERT(plugIndex >= 0 && plugIndex < MAX_PLUGS); void *addr = Library_Symbol(d->hInstPlug[plugIndex], fn); if (!addr) @@ -297,7 +297,7 @@ bool Plugins::exchangeGameEntryPoints(pluginid_t pluginId) // Query all the known entrypoints. #define GET_FUNC_OPTIONAL(Name) { functionAssign(d->gameExports.Name, d->getGameAPI(#Name)); } - #define GET_FUNC(Name) { GET_FUNC_OPTIONAL(Name); DENG2_ASSERT(d->gameExports.Name); } + #define GET_FUNC(Name) { GET_FUNC_OPTIONAL(Name); DE_ASSERT(d->gameExports.Name); } GET_FUNC(PreInit); GET_FUNC(PostInit); @@ -358,18 +358,18 @@ GameExports &Plugins::gameExports() const bool Plugins::hasHook(HookType type) const { - DENG2_ASSERT(type >= 0 && type < NUM_HOOK_TYPES); + DE_ASSERT(type >= 0 && type < NUM_HOOK_TYPES); return !d->hooks[type].isEmpty(); } void Plugins::addHook(HookType type, hookfunc_t function) { - DENG2_ASSERT(type >= 0 && type < NUM_HOOK_TYPES); + DE_ASSERT(type >= 0 && type < NUM_HOOK_TYPES); // The current plugin must be set before calling this. The engine has the // responsibility to call setActivePluginId() whenever it passes control // to a plugin, and then set it back to zero after it gets control back. - DENG2_ASSERT(d->activePluginId() != 0); + DE_ASSERT(d->activePluginId() != 0); if (function) { @@ -387,7 +387,7 @@ void Plugins::addHook(HookType type, hookfunc_t function) bool Plugins::removeHook(HookType type, hookfunc_t function) { - DENG2_ASSERT(type >= 0 && type < NUM_HOOK_TYPES); + DE_ASSERT(type >= 0 && type < NUM_HOOK_TYPES); if (function) { Hook temp; diff --git a/doomsday/apps/libdoomsday/src/resource/animgroup.cpp b/doomsday/apps/libdoomsday/src/resource/animgroup.cpp index 05064f9a07..27c4f0340f 100644 --- a/doomsday/apps/libdoomsday/src/resource/animgroup.cpp +++ b/doomsday/apps/libdoomsday/src/resource/animgroup.cpp @@ -25,7 +25,7 @@ namespace res { -DENG2_PIMPL_NOREF(AnimGroup) +DE_PIMPL_NOREF(AnimGroup) { Frames frames; int uniqueId = 0; diff --git a/doomsday/apps/libdoomsday/src/resource/animgroups.cpp b/doomsday/apps/libdoomsday/src/resource/animgroups.cpp index 53ab582a5e..e9c3decab6 100644 --- a/doomsday/apps/libdoomsday/src/resource/animgroups.cpp +++ b/doomsday/apps/libdoomsday/src/resource/animgroups.cpp @@ -26,7 +26,7 @@ namespace res { using namespace de; -DENG2_PIMPL_NOREF(AnimGroups) +DE_PIMPL_NOREF(AnimGroups) { QList animGroups; diff --git a/doomsday/apps/libdoomsday/src/resource/bundles.cpp b/doomsday/apps/libdoomsday/src/resource/bundles.cpp index 76341eddba..9951fd93bc 100644 --- a/doomsday/apps/libdoomsday/src/resource/bundles.cpp +++ b/doomsday/apps/libdoomsday/src/resource/bundles.cpp @@ -39,9 +39,9 @@ static int const MATCH_MAXIMUM_SCORE = 4; // in case 5 specified, allow 1 to not static String const VAR_REQUIRED_SCORE = "requiredScore"; -DENG2_PIMPL(Bundles) -, DENG2_OBSERVES(FileIndex, Addition) -, DENG2_OBSERVES(FileIndex, Removal) +DE_PIMPL(Bundles) +, DE_OBSERVES(FileIndex, Addition) +, DE_OBSERVES(FileIndex, Removal) , public Lockable { String defPath; @@ -56,17 +56,17 @@ DENG2_PIMPL(Bundles) , defPath(bundleDefPath) { // Observe new data files. - App::fileSystem().indexFor(DENG2_TYPE_NAME(DataFile)) .audienceForAddition() += this; - App::fileSystem().indexFor(DENG2_TYPE_NAME(DataFile)) .audienceForRemoval() += this; - App::fileSystem().indexFor(DENG2_TYPE_NAME(DataFolder)).audienceForAddition() += this; - App::fileSystem().indexFor(DENG2_TYPE_NAME(DataFolder)).audienceForRemoval() += this; + App::fileSystem().indexFor(DE_TYPE_NAME(DataFile)) .audienceForAddition() += this; + App::fileSystem().indexFor(DE_TYPE_NAME(DataFile)) .audienceForRemoval() += this; + App::fileSystem().indexFor(DE_TYPE_NAME(DataFolder)).audienceForAddition() += this; + App::fileSystem().indexFor(DE_TYPE_NAME(DataFolder)).audienceForRemoval() += this; } ~Impl() { // Ongoing identification tasks should first finish. { - DENG2_GUARD(this); + DE_GUARD(this); bundlesToIdentify.clear(); } tasks.waitForDone(); @@ -74,9 +74,9 @@ DENG2_PIMPL(Bundles) void fileAdded(File const &dataFile, FileIndex const &) { - DENG2_ASSERT(is(dataFile)); + DE_ASSERT(is(dataFile)); { - DENG2_GUARD(this); + DE_GUARD(this); bundlesToIdentify.insert(maybeAs(dataFile)); } // Use a deferred call to avoid spamming. @@ -88,15 +88,15 @@ DENG2_PIMPL(Bundles) void fileRemoved(File const &dataFile, FileIndex const &) { - DENG2_ASSERT(is(dataFile)); + DE_ASSERT(is(dataFile)); - DENG2_GUARD(this); + DE_GUARD(this); bundlesToIdentify.remove(maybeAs(dataFile)); } DataBundle const *nextToIdentify() { - DENG2_GUARD(this); + DE_GUARD(this); if (bundlesToIdentify.isEmpty()) { return nullptr; @@ -110,7 +110,7 @@ DENG2_PIMPL(Bundles) { Folder::waitForPopulation(); - DENG2_ASSERT(App::rootFolder().has("/sys/bundles")); + DE_ASSERT(App::rootFolder().has("/sys/bundles")); bool wasIdentified = false; int count = 0; @@ -186,10 +186,10 @@ DENG2_PIMPL(Bundles) } } - DENG2_PIMPL_AUDIENCE(Identify) + DE_PIMPL_AUDIENCE(Identify) }; -DENG2_AUDIENCE_METHOD(Bundles, Identify) +DE_AUDIENCE_METHOD(Bundles, Identify) Bundles::Bundles(const String &bundleDefPath) : d(new Impl(this, bundleDefPath)) @@ -215,7 +215,7 @@ void Bundles::identify() d->identifyAddedDataBundles(); if (isEverythingIdentified()) { - DENG2_FOR_AUDIENCE2(Identify, i) + DE_FOR_AUDIENCE2(Identify, i) { i->dataBundlesIdentified(); } @@ -226,7 +226,7 @@ void Bundles::identify() bool Bundles::isEverythingIdentified() const { - DENG2_GUARD(d); + DE_GUARD(d); return d->bundlesToIdentify.isEmpty(); } diff --git a/doomsday/apps/libdoomsday/src/resource/colorpalette.cpp b/doomsday/apps/libdoomsday/src/resource/colorpalette.cpp index 0fa2cdee3c..b33de5b479 100644 --- a/doomsday/apps/libdoomsday/src/resource/colorpalette.cpp +++ b/doomsday/apps/libdoomsday/src/resource/colorpalette.cpp @@ -157,7 +157,7 @@ ColorTable ColorTableReader::read(String format, int colorCount, return colors; } -DENG2_PIMPL(ColorPalette) +DE_PIMPL(ColorPalette) { typedef Vec3ub Color; typedef QVector ColorTable; @@ -190,7 +190,7 @@ DENG2_PIMPL(ColorPalette) void notifyColorTableChanged() { - DENG2_FOR_PUBLIC_AUDIENCE(ColorTableChange, i) + DE_FOR_PUBLIC_AUDIENCE(ColorTableChange, i) { i->colorPaletteColorTableChanged(self()); } @@ -339,7 +339,7 @@ void ColorPalette::newTranslation(String xlatId, Translation const &mappings) return; } - DENG2_ASSERT(mappings.count() == colorCount()); // sanity check + DE_ASSERT(mappings.count() == colorCount()); // sanity check if (!xlatId.isEmpty()) { diff --git a/doomsday/apps/libdoomsday/src/resource/colorpalettes.cpp b/doomsday/apps/libdoomsday/src/resource/colorpalettes.cpp index eb2756d877..642232cbbb 100644 --- a/doomsday/apps/libdoomsday/src/resource/colorpalettes.cpp +++ b/doomsday/apps/libdoomsday/src/resource/colorpalettes.cpp @@ -26,7 +26,7 @@ using namespace de; namespace res { -DENG2_PIMPL_NOREF(ColorPalettes) +DE_PIMPL_NOREF(ColorPalettes) { typedef QMap ColorPalettes; ColorPalettes colorPalettes; // owned @@ -50,10 +50,10 @@ DENG2_PIMPL_NOREF(ColorPalettes) defaultColorPalette = 0; } - DENG2_PIMPL_AUDIENCE(Addition) + DE_PIMPL_AUDIENCE(Addition) }; -DENG2_AUDIENCE_METHOD(ColorPalettes, Addition) +DE_AUDIENCE_METHOD(ColorPalettes, Addition) ColorPalettes::ColorPalettes() : d(new Impl) @@ -120,7 +120,7 @@ void ColorPalettes::addColorPalette(ColorPalette &newPalette, String const &name d->defaultColorPalette = newPalette.id(); } - DENG2_FOR_AUDIENCE2(Addition, i) i->colorPaletteAdded(newPalette); + DE_FOR_AUDIENCE2(Addition, i) i->colorPaletteAdded(newPalette); } Id ColorPalettes::defaultColorPalette() const diff --git a/doomsday/apps/libdoomsday/src/resource/composite.cpp b/doomsday/apps/libdoomsday/src/resource/composite.cpp index e818a3134b..aecf69fc71 100644 --- a/doomsday/apps/libdoomsday/src/resource/composite.cpp +++ b/doomsday/apps/libdoomsday/src/resource/composite.cpp @@ -87,7 +87,7 @@ void Composite::Component::setLumpNum(lumpnum_t num) _lumpNum = num; } -DENG2_PIMPL_NOREF(Composite) +DE_PIMPL_NOREF(Composite) { String name; ///< Symbolic, percent encoded. Flags flags; ///< Usage traits. diff --git a/doomsday/apps/libdoomsday/src/resource/databundle.cpp b/doomsday/apps/libdoomsday/src/resource/databundle.cpp index 32f24c6aed..61b92689ab 100644 --- a/doomsday/apps/libdoomsday/src/resource/databundle.cpp +++ b/doomsday/apps/libdoomsday/src/resource/databundle.cpp @@ -74,7 +74,7 @@ namespace internal }; } -DENG2_PIMPL(DataBundle), public Lockable +DE_PIMPL(DataBundle), public Lockable { bool ignored = false; SafePtr source; @@ -89,7 +89,7 @@ DENG2_PIMPL(DataBundle), public Lockable ~Impl() { - DENG2_GUARD(this); + DE_GUARD(this); delete pkgLink.get(); } @@ -109,7 +109,7 @@ DENG2_PIMPL(DataBundle), public Lockable { throw FormatError("DataBundle::identify", dynamic_cast(thisPublic)->description() + - ": file contents may be corrupted " DENG2_CHAR_MDASH + ": file contents may be corrupted " DE_CHAR_MDASH " WAD lump directory was not found"); } @@ -136,7 +136,7 @@ DENG2_PIMPL(DataBundle), public Lockable */ bool identify() { - DENG2_GUARD(this); + DE_GUARD(this); // It is sufficient to identify each bundle only once. if (ignored || !packageId.isEmpty()) return false; @@ -974,7 +974,7 @@ DENG2_PIMPL(DataBundle), public Lockable if (!version.isEmpty()) { - DENG2_ASSERT(Version(version).isValid()); + DE_ASSERT(Version(version).isValid()); linkPath += QString("_%1.pack").arg(version); } else @@ -1178,13 +1178,13 @@ void DataBundle::set(Offset, Byte const *, Size) Record &DataBundle::objectNamespace() { - DENG2_ASSERT(dynamic_cast(this) != nullptr); + DE_ASSERT(dynamic_cast(this) != nullptr); return asFile().objectNamespace().subrecord(QStringLiteral("package")); } Record const &DataBundle::objectNamespace() const { - DENG2_ASSERT(dynamic_cast(this) != nullptr); + DE_ASSERT(dynamic_cast(this) != nullptr); return asFile().objectNamespace().subrecord(QStringLiteral("package")); } @@ -1271,7 +1271,7 @@ bool DataBundle::isNested() const DataBundle *DataBundle::containerBundle() const { auto const *file = dynamic_cast(this); - DENG2_ASSERT(file != nullptr); + DE_ASSERT(file != nullptr); for (Folder *folder = file->parent(); folder; folder = folder->parent()) { @@ -1286,7 +1286,7 @@ DataBundle *DataBundle::containerBundle() const String DataBundle::containerPackageId() const { auto const *file = dynamic_cast(this); - DENG2_ASSERT(file != nullptr); + DE_ASSERT(file != nullptr); return Package::identifierForContainerOfFile(*file); } @@ -1364,7 +1364,7 @@ QList DataBundle::loadedBundles() // static { // Packages may declare a list of data files to load. Package const *pkg = PackageLoader::get().tryFindLoaded(*f); - DENG2_ASSERT(pkg); + DE_ASSERT(pkg); auto const &meta = Package::metadata(*f); if (meta.has(VAR_DATA_FILES)) @@ -1406,13 +1406,13 @@ QList DataBundle::findAllNative(String const &fileNameOrPart NativePath const searchPath = NativePath(fileNameOrPartialNativePath).expand(); FS::FoundFiles found; - FS::get().findAllOfTypes(StringList({ DENG2_TYPE_NAME(DataFile), - DENG2_TYPE_NAME(DataFolder) }), + FS::get().findAllOfTypes(StringList({ DE_TYPE_NAME(DataFile), + DE_TYPE_NAME(DataFolder) }), searchPath.fileName().toLower(), found); QList bundles; for (auto const *f : found) { - DENG2_ASSERT(dynamic_cast(f)); + DE_ASSERT(dynamic_cast(f)); bundles << dynamic_cast(f); } diff --git a/doomsday/apps/libdoomsday/src/resource/idtech1flatlib.cpp b/doomsday/apps/libdoomsday/src/resource/idtech1flatlib.cpp index 1e7a83d912..4f2528fb7d 100644 --- a/doomsday/apps/libdoomsday/src/resource/idtech1flatlib.cpp +++ b/doomsday/apps/libdoomsday/src/resource/idtech1flatlib.cpp @@ -21,7 +21,7 @@ namespace res { -DENG2_PIMPL(IdTech1FlatLib) +DE_PIMPL(IdTech1FlatLib) { const LumpCatalog &catalog; QHash flats; diff --git a/doomsday/apps/libdoomsday/src/resource/idtech1image.cpp b/doomsday/apps/libdoomsday/src/resource/idtech1image.cpp index 6f11120e15..d8c110d4cb 100644 --- a/doomsday/apps/libdoomsday/src/resource/idtech1image.cpp +++ b/doomsday/apps/libdoomsday/src/resource/idtech1image.cpp @@ -24,7 +24,7 @@ using namespace de; namespace res { -DENG2_PIMPL_NOREF(IdTech1Image) +DE_PIMPL_NOREF(IdTech1Image) { Block pixels; // RGBA_8888 Size pixelSize; diff --git a/doomsday/apps/libdoomsday/src/resource/lumpcatalog.cpp b/doomsday/apps/libdoomsday/src/resource/lumpcatalog.cpp index b17e7ecf6c..98a1fbe5f8 100644 --- a/doomsday/apps/libdoomsday/src/resource/lumpcatalog.cpp +++ b/doomsday/apps/libdoomsday/src/resource/lumpcatalog.cpp @@ -29,7 +29,7 @@ using namespace de; namespace res { -DENG2_PIMPL(LumpCatalog) +DE_PIMPL(LumpCatalog) { StringList packageIds; QList bundles; /// @todo Should observe for deletion. -jk @@ -173,7 +173,7 @@ Block LumpCatalog::read(const LumpPos &lump) const Block data; if (lump.first) { - DENG2_ASSERT(lump.first->lumpDirectory()); + DE_ASSERT(lump.first->lumpDirectory()); auto const &entry = lump.first->lumpDirectory()->entry(lump.second); data.copyFrom(*lump.first, entry.offset, entry.size); } @@ -184,7 +184,7 @@ String LumpCatalog::lumpName(const LumpPos &lump) const { if (lump.first) { - DENG2_ASSERT(lump.first->lumpDirectory()); + DE_ASSERT(lump.first->lumpDirectory()); return String::fromLatin1(lump.first->lumpDirectory()->entry(lump.second).name); } return {}; diff --git a/doomsday/apps/libdoomsday/src/resource/lumpdirectory.cpp b/doomsday/apps/libdoomsday/src/resource/lumpdirectory.cpp index 4a213113b3..b9db0c2100 100644 --- a/doomsday/apps/libdoomsday/src/resource/lumpdirectory.cpp +++ b/doomsday/apps/libdoomsday/src/resource/lumpdirectory.cpp @@ -36,7 +36,7 @@ static const QRegularExpression regExMy ("^E[1-9]M[1-9]$"); static const QRegularExpression regMAPxx("^MAP[0-9][0-9]$"); static const Block flatMarkers[4] = {"FF_START", "FF_END", "F_START", "F_END"}; -DENG2_PIMPL_NOREF(LumpDirectory), public ISerializable +DE_PIMPL_NOREF(LumpDirectory), public ISerializable { Type type = Invalid; MapType mapType = None; diff --git a/doomsday/apps/libdoomsday/src/resource/manifest.cpp b/doomsday/apps/libdoomsday/src/resource/manifest.cpp index 587e97157e..f8802a7506 100644 --- a/doomsday/apps/libdoomsday/src/resource/manifest.cpp +++ b/doomsday/apps/libdoomsday/src/resource/manifest.cpp @@ -32,7 +32,7 @@ using namespace de; -DENG2_PIMPL(ResourceManifest) +DE_PIMPL(ResourceManifest) { resourceclassid_t classId; @@ -103,8 +103,8 @@ enum lumpsizecondition_t */ static void checkSizeConditionInIdentityKey(String &idKey, lumpsizecondition_t *pCond, size_t *pSize) { - DENG_ASSERT(pCond != 0); - DENG_ASSERT(pSize != 0); + DE_ASSERT(pCond != 0); + DE_ASSERT(pSize != 0); *pCond = LSCOND_NONE; *pSize = 0; @@ -207,7 +207,7 @@ static bool validateWad(String const &filePath, QStringList const &identityKeys) } // Check each lump. - DENG2_FOR_EACH_CONST(QStringList, i, identityKeys) + DE_FOR_EACH_CONST(QStringList, i, identityKeys) { if (lumpNumForIdentityKey(lumpIndex, *i) < 0) { diff --git a/doomsday/apps/libdoomsday/src/resource/mapmanifest.cpp b/doomsday/apps/libdoomsday/src/resource/mapmanifest.cpp index 45931306d1..8d04385898 100644 --- a/doomsday/apps/libdoomsday/src/resource/mapmanifest.cpp +++ b/doomsday/apps/libdoomsday/src/resource/mapmanifest.cpp @@ -68,7 +68,7 @@ MapManifest &MapManifest::setRecognizer(Id1MapRecognizer *newRecognizer) Id1MapRecognizer const &MapManifest::recognizer() const { - DENG2_ASSERT(bool(_recognized)); + DE_ASSERT(bool(_recognized)); return *_recognized; } diff --git a/doomsday/apps/libdoomsday/src/resource/mapmanifests.cpp b/doomsday/apps/libdoomsday/src/resource/mapmanifests.cpp index 909724beed..e9bc5cacf8 100644 --- a/doomsday/apps/libdoomsday/src/resource/mapmanifests.cpp +++ b/doomsday/apps/libdoomsday/src/resource/mapmanifests.cpp @@ -24,7 +24,7 @@ using namespace de; namespace res { -DENG2_PIMPL_NOREF(MapManifests) +DE_PIMPL_NOREF(MapManifests) { Tree manifests; diff --git a/doomsday/apps/libdoomsday/src/resource/patch.cpp b/doomsday/apps/libdoomsday/src/resource/patch.cpp index b3d8710221..539b269283 100644 --- a/doomsday/apps/libdoomsday/src/resource/patch.cpp +++ b/doomsday/apps/libdoomsday/src/resource/patch.cpp @@ -103,12 +103,12 @@ static bool readNextPost(Post &post, Reader &reader) static Columns readPosts(ColumnOffsets const &offsets, Reader &reader) { Columns columns; -#ifdef DENG2_QT_4_7_OR_NEWER +#ifdef DE_QT_4_7_OR_NEWER columns.reserve(offsets.size()); #endif Post post; - DENG2_FOR_EACH_CONST(ColumnOffsets, i, offsets) + DE_FOR_EACH_CONST(ColumnOffsets, i, offsets) { reader.setOffset(*i); @@ -135,7 +135,7 @@ static Columns readPosts(ColumnOffsets const &offsets, Reader &reader) static ColumnOffsets readColumnOffsets(int width, Reader &reader) { ColumnOffsets offsets; -#ifdef DENG2_QT_4_7_OR_NEWER +#ifdef DE_QT_4_7_OR_NEWER offsets.reserve(width); #endif @@ -159,11 +159,11 @@ static int calcRealHeight(Columns const &columns) { QRect geom(QPoint(0, 0), QSize(1, 0)); - DENG2_FOR_EACH_CONST(Columns, colIt, columns) + DE_FOR_EACH_CONST(Columns, colIt, columns) { int tallTop = -1; // Keep track of pos (clipping). - DENG2_FOR_EACH_CONST(Posts, postIt, *colIt) + DE_FOR_EACH_CONST(Posts, postIt, *colIt) { Post const &post = *postIt; @@ -191,13 +191,13 @@ static Block compositeImage(Reader &reader, ColorPaletteTranslation const *xlatT bool const maskZero = flags.testFlag(Patch::MaskZero); bool const clipToLogicalDimensions = flags.testFlag(Patch::ClipToLogicalDimensions); -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG // Is the "logical" height of the image equal to the actual height of the // composited pixel posts? if (meta.logicalDimensions.y != meta.dimensions.y) { int postCount = 0; - DENG2_FOR_EACH_CONST(Columns, i, columns) + DE_FOR_EACH_CONST(Columns, i, columns) { postCount += i->count(); } @@ -222,11 +222,11 @@ static Block compositeImage(Reader &reader, ColorPaletteTranslation const *xlatT dbyte *topAlpha = output.data() + pels; // Composite the patch into the output buffer. - DENG2_FOR_EACH_CONST(Columns, colIt, columns) + DE_FOR_EACH_CONST(Columns, colIt, columns) { int tallTop = -1; // Keep track of pos (clipping). - DENG2_FOR_EACH_CONST(Posts, postIt, *colIt) + DE_FOR_EACH_CONST(Posts, postIt, *colIt) { Post const &post = *postIt; diff --git a/doomsday/apps/libdoomsday/src/resource/pcx.cpp b/doomsday/apps/libdoomsday/src/resource/pcx.cpp index 4d494ad468..6db55ebf04 100644 --- a/doomsday/apps/libdoomsday/src/resource/pcx.cpp +++ b/doomsday/apps/libdoomsday/src/resource/pcx.cpp @@ -63,7 +63,7 @@ static void PCX_SetLastError(char const *msg) static bool load(FileHandle &file, int width, int height, uint8_t *dstBuf) { - DENG2_ASSERT(dstBuf != 0); + DE_ASSERT(dstBuf != 0); int x, y, dataByte, runLength; bool result = false; diff --git a/doomsday/apps/libdoomsday/src/resource/resourceclass.cpp b/doomsday/apps/libdoomsday/src/resource/resourceclass.cpp index 5d3a5aa172..64eaba4de6 100644 --- a/doomsday/apps/libdoomsday/src/resource/resourceclass.cpp +++ b/doomsday/apps/libdoomsday/src/resource/resourceclass.cpp @@ -23,7 +23,7 @@ using namespace de; static ResourceClass &(*classGetter)(resourceclassid_t) = 0; -DENG2_PIMPL_NOREF(ResourceClass) +DE_PIMPL_NOREF(ResourceClass) { /// Symbolic name for this class. String name; @@ -81,7 +81,7 @@ bool ResourceClass::isNull() const ResourceClass &ResourceClass::classForId(resourceclassid_t id) { - DENG_ASSERT(classGetter != 0); + DE_ASSERT(classGetter != 0); return classGetter(id); } diff --git a/doomsday/apps/libdoomsday/src/resource/resources.cpp b/doomsday/apps/libdoomsday/src/resource/resources.cpp index f7b5b1af86..1d0286b949 100644 --- a/doomsday/apps/libdoomsday/src/resource/resources.cpp +++ b/doomsday/apps/libdoomsday/src/resource/resources.cpp @@ -80,9 +80,9 @@ static String resolveUriSymbol(String const &symbol) } } -DENG2_PIMPL(Resources) -, DENG2_OBSERVES(PackageLoader, Load) -, DENG2_OBSERVES(PackageLoader, Unload) +DE_PIMPL(Resources) +, DE_OBSERVES(PackageLoader, Load) +, DE_OBSERVES(PackageLoader, Unload) { typedef QList ResourceClasses; @@ -230,7 +230,7 @@ void Resources::reloadAllResources() Resources &Resources::get() { - DENG2_ASSERT(theResources); + DE_ASSERT(theResources); return *theResources; } @@ -600,7 +600,7 @@ static bool isKnownTextureSchemeCallback(String name) */ D_CMD(ListMaps) { - DENG2_UNUSED(src); + DE_UNUSED(src); de::Uri search = de::Uri::fromUserInput(&argv[1], argc - 1); if (search.scheme().isEmpty()) search.setScheme("Maps"); @@ -617,7 +617,7 @@ D_CMD(ListMaps) D_CMD(ListMaterials) { - DENG2_UNUSED(src); + DE_UNUSED(src); de::Uri search = de::Uri::fromUserInput(&argv[1], argc - 1, &isKnownMaterialSchemeCallback); @@ -634,7 +634,7 @@ D_CMD(ListMaterials) D_CMD(ListTextures) { - DENG2_UNUSED(src); + DE_UNUSED(src); de::Uri search = de::Uri::fromUserInput(&argv[1], argc - 1, &isKnownTextureSchemeCallback); @@ -649,10 +649,10 @@ D_CMD(ListTextures) return true; } -#ifdef DENG_DEBUG +#ifdef DE_DEBUG D_CMD(PrintMaterialStats) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); LOG_MSG(_E(b) "Material Statistics:"); world::Materials::get().forAllMaterialSchemes([] (world::MaterialScheme &scheme) @@ -671,7 +671,7 @@ D_CMD(PrintMaterialStats) D_CMD(PrintTextureStats) { - DENG2_UNUSED3(src, argc, argv); + DE_UNUSED(src, argc, argv); LOG_MSG(_E(b) "Texture Statistics:"); foreach (res::TextureScheme *scheme, res::Textures::get().allTextureSchemes()) @@ -686,7 +686,7 @@ D_CMD(PrintTextureStats) } return true; } -#endif // DENG_DEBUG +#endif // DE_DEBUG void Resources::consoleRegister() { @@ -701,7 +701,7 @@ void Resources::consoleRegister() C_CMD("listmaps", "s", ListMaps) C_CMD("listmaps", "", ListMaps) -#ifdef DENG_DEBUG +#ifdef DE_DEBUG C_CMD("texturestats", NULL, PrintTextureStats) C_CMD("materialstats", NULL, PrintMaterialStats) #endif diff --git a/doomsday/apps/libdoomsday/src/resource/sprites.cpp b/doomsday/apps/libdoomsday/src/resource/sprites.cpp index 2f39eb63f3..e587bd710e 100644 --- a/doomsday/apps/libdoomsday/src/resource/sprites.cpp +++ b/doomsday/apps/libdoomsday/src/resource/sprites.cpp @@ -31,7 +31,7 @@ namespace res { using namespace de; -DENG2_PIMPL_NOREF(Sprites) +DE_PIMPL_NOREF(Sprites) { QHash sprites; @@ -61,7 +61,7 @@ DENG2_PIMPL_NOREF(Sprites) SpriteSet &addSpriteSet(spritenum_t id, SpriteSet const &frames) { - DENG2_ASSERT(!tryFindSpriteSet(id)); // sanity check. + DE_ASSERT(!tryFindSpriteSet(id)); // sanity check. return sprites.insert(id, frames).value(); } }; @@ -203,7 +203,7 @@ static SpriteDefs buildSpriteFramesFromTextures(res::TextureScheme::Index const } // (Re)Configure the frame. - DENG2_ASSERT(frame); + DE_ASSERT(frame); frame->material = material; frame->angle = angleNumber; frame->mirrored = i == 1; diff --git a/doomsday/apps/libdoomsday/src/resource/texture.cpp b/doomsday/apps/libdoomsday/src/resource/texture.cpp index 40eee888f3..31f093e0dc 100644 --- a/doomsday/apps/libdoomsday/src/resource/texture.cpp +++ b/doomsday/apps/libdoomsday/src/resource/texture.cpp @@ -36,7 +36,7 @@ namespace res { typedef QHash Analyses; -DENG2_PIMPL(Texture) +DE_PIMPL(Texture) { TextureManifest &manifest; Flags flags; @@ -67,7 +67,7 @@ DENG2_PIMPL(Texture) /// Notify iterested parties of a change in world dimensions. void notifyDimensionsChanged() { - DENG2_FOR_PUBLIC_AUDIENCE(DimensionsChange, i) i->textureDimensionsChanged(self()); + DE_FOR_PUBLIC_AUDIENCE(DimensionsChange, i) i->textureDimensionsChanged(self()); } }; @@ -80,7 +80,7 @@ Texture::Texture(TextureManifest &manifest) : d(new Impl(this, manifest)) Texture::~Texture() { - DENG2_FOR_AUDIENCE(Deletion, i) i->textureBeingDeleted(*this); + DE_FOR_AUDIENCE(Deletion, i) i->textureBeingDeleted(*this); if (!manifest().schemeName().compareWithoutCase("Textures")) { @@ -184,7 +184,7 @@ void Texture::setAnalysisDataPointer(AnalysisId analysisId, void *newData) void *existingData = analysisDataPointer(analysisId); if (existingData) { -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG if (newData) { LOGDEV_RES_VERBOSE("Image analysis (id:%i) already present for \"%s\", will be replaed") @@ -209,7 +209,7 @@ void Texture::setFlags(Texture::Flags flagsToChange, FlagOp operation) String Texture::description() const { String str = String("Texture " _E(b) "%1" _E(.)).arg(manifest().composeUri().asText()); -#ifdef DENG_DEBUG +#ifdef DE_DEBUG str += String(" [addr:0x%1]").arg(de::dintptr(this), 0, 16); #endif str += _E(l) " Dimensions:" _E(.) @@ -221,7 +221,7 @@ String Texture::description() const D_CMD(InspectTexture) { - DENG2_UNUSED(src); + DE_UNUSED(src); de::Uri search = de::Uri::fromUserInput(&argv[1], argc - 1); diff --git a/doomsday/apps/libdoomsday/src/resource/texturemanifest.cpp b/doomsday/apps/libdoomsday/src/resource/texturemanifest.cpp index 64e5b37846..72aca2734a 100644 --- a/doomsday/apps/libdoomsday/src/resource/texturemanifest.cpp +++ b/doomsday/apps/libdoomsday/src/resource/texturemanifest.cpp @@ -27,8 +27,8 @@ namespace res { static TextureManifest::TextureConstructor textureConstructor; -DENG2_PIMPL(TextureManifest) -, DENG2_OBSERVES(Texture, Deletion) +DE_PIMPL(TextureManifest) +, DE_OBSERVES(Texture, Deletion) { int uniqueId; ///< Scheme-unique identifier (user defined). de::Uri resourceUri; ///< Image resource path, to be loaded. @@ -46,7 +46,7 @@ DENG2_PIMPL(TextureManifest) ~Impl() { if (texture) texture->audienceForDeletion -= this; - DENG2_FOR_PUBLIC_AUDIENCE(Deletion, i) i->textureManifestBeingDeleted(self()); + DE_FOR_PUBLIC_AUDIENCE(Deletion, i) i->textureManifestBeingDeleted(self()); } // Observes Texture Deletion. @@ -66,13 +66,13 @@ Texture *TextureManifest::derive() LOG_AS("TextureManifest::derive"); if (!hasTexture()) { - DENG2_ASSERT(textureConstructor != nullptr); + DE_ASSERT(textureConstructor != nullptr); // Instantiate and associate the new texture with this. setTexture(textureConstructor(*this)); // Notify interested parties that a new texture was derived from the manifest. - DENG2_FOR_AUDIENCE(TextureDerived, i) i->textureManifestTextureDerived(*this, texture()); + DE_FOR_AUDIENCE(TextureDerived, i) i->textureManifestTextureDerived(*this, texture()); } else { @@ -161,7 +161,7 @@ bool TextureManifest::setUniqueId(int newUniqueId) d->uniqueId = newUniqueId; // Notify interested parties that the uniqueId has changed. - DENG2_FOR_AUDIENCE(UniqueIdChange, i) i->textureManifestUniqueIdChanged(*this); + DE_FOR_AUDIENCE(UniqueIdChange, i) i->textureManifestUniqueIdChanged(*this); return true; } diff --git a/doomsday/apps/libdoomsday/src/resource/textures.cpp b/doomsday/apps/libdoomsday/src/resource/textures.cpp index 7e96324afa..f8cc4fac2a 100644 --- a/doomsday/apps/libdoomsday/src/resource/textures.cpp +++ b/doomsday/apps/libdoomsday/src/resource/textures.cpp @@ -40,10 +40,10 @@ uint qHash(TextureSchemeHashKey const &key) return key.scheme.at(2).toLower().unicode(); } -DENG2_PIMPL(Textures) -, DENG2_OBSERVES(TextureScheme, ManifestDefined) -, DENG2_OBSERVES(TextureManifest, TextureDerived) -, DENG2_OBSERVES(Texture, Deletion) +DE_PIMPL(Textures) +, DE_OBSERVES(TextureScheme, ManifestDefined) +, DE_OBSERVES(TextureManifest, TextureDerived) +, DE_OBSERVES(Texture, Deletion) { TextureSchemes textureSchemes; QVector textureSchemeCreationOrder; @@ -102,7 +102,7 @@ DENG2_PIMPL(Textures) void createTextureScheme(String const &name) { - DENG2_ASSERT(name.length() >= TextureScheme::min_name_length); + DE_ASSERT(name.length() >= TextureScheme::min_name_length); // Create a new scheme. TextureScheme *newScheme = new TextureScheme(name); @@ -278,7 +278,7 @@ DENG2_PIMPL(Textures) } // Seek to each offset and deserialize the definition. - DENG2_FOR_EACH_CONST(Offsets, i, offsets) + DE_FOR_EACH_CONST(Offsets, i, offsets) { // Read the next definition. reader.setOffset(i.key()); @@ -289,7 +289,7 @@ DENG2_PIMPL(Textures) // If the composite contains at least one known component image it is // considered valid and we will therefore produce a Texture for it. - DENG2_FOR_EACH_CONST(Composite::Components, it, def->components()) + DE_FOR_EACH_CONST(Composite::Components, it, def->components()) { if (it->lumpNum() >= 0) { @@ -351,7 +351,7 @@ DENG2_PIMPL(Textures) // Process each definition file. int origIndexBase = 0; - //DENG2_FOR_EACH_CONST(QList, i, defFiles) + //DE_FOR_EACH_CONST(QList, i, defFiles) foreach (auto *file, defFiles) { //File1 &file = **i; diff --git a/doomsday/apps/libdoomsday/src/resource/texturescheme.cpp b/doomsday/apps/libdoomsday/src/resource/texturescheme.cpp index d1fe4f5e0e..4472f23fcf 100644 --- a/doomsday/apps/libdoomsday/src/resource/texturescheme.cpp +++ b/doomsday/apps/libdoomsday/src/resource/texturescheme.cpp @@ -26,9 +26,9 @@ using namespace de; namespace res { -DENG2_PIMPL(TextureScheme) -, DENG2_OBSERVES(TextureManifest, UniqueIdChange) -, DENG2_OBSERVES(TextureManifest, Deletion) +DE_PIMPL(TextureScheme) +, DE_OBSERVES(TextureManifest, UniqueIdChange) +, DE_OBSERVES(TextureManifest, Deletion) { /// Symbolic name of the scheme. String name; @@ -52,7 +52,7 @@ DENG2_PIMPL(TextureScheme) ~Impl() { self().clear(); - DENG_ASSERT(index.isEmpty()); + DE_ASSERT(index.isEmpty()); } bool inline uniqueIdInLutRange(int uniqueId) const @@ -92,7 +92,7 @@ DENG2_PIMPL(TextureScheme) if (!uniqueIdLutDirty) { int uniqueId = manifest.uniqueId(); - DENG_ASSERT(uniqueIdInLutRange(uniqueId)); + DE_ASSERT(uniqueIdInLutRange(uniqueId)); uniqueIdLut[uniqueId - uniqueIdBase] = 0; } } @@ -101,7 +101,7 @@ DENG2_PIMPL(TextureScheme) void linkInUniqueIdLut(TextureManifest &manifest) { int uniqueId = manifest.uniqueId(); - DENG_ASSERT(uniqueIdInLutRange(uniqueId)); + DE_ASSERT(uniqueIdInLutRange(uniqueId)); uniqueIdLut[uniqueId - uniqueIdBase] = &manifest; } @@ -202,7 +202,7 @@ TextureManifest &TextureScheme::declare(Path const &path, int const sizeBefore = d->index.size(); Manifest *newManifest = &d->index.insert(path); - DENG2_ASSERT(newManifest); + DE_ASSERT(newManifest); if (d->index.size() != sizeBefore) { @@ -216,7 +216,7 @@ TextureManifest &TextureScheme::declare(Path const &path, newManifest->audienceForDeletion += d; // Notify interested parties that a new manifest was defined in the scheme. - DENG2_FOR_AUDIENCE(ManifestDefined, i) i->textureSchemeManifestDefined(*this, *newManifest); + DE_FOR_AUDIENCE(ManifestDefined, i) i->textureSchemeManifestDefined(*this, *newManifest); } /* diff --git a/doomsday/apps/libdoomsday/src/savegames.cpp b/doomsday/apps/libdoomsday/src/savegames.cpp index b5f4a5cb19..b6161b1da7 100644 --- a/doomsday/apps/libdoomsday/src/savegames.cpp +++ b/doomsday/apps/libdoomsday/src/savegames.cpp @@ -60,9 +60,9 @@ static Value *Function_GameStateFolder_ConvertAll(Context &, Function::ArgumentV // SaveGames ---------------------------------------------------------------------------- -DENG2_PIMPL(SaveGames) -, DENG2_OBSERVES(Games, Addition) // savegames folder setup -, DENG2_OBSERVES(Loop, Iteration) // post savegame conversion FS population +DE_PIMPL(SaveGames) +, DE_OBSERVES(Games, Addition) // savegames folder setup +, DE_OBSERVES(Loop, Iteration) // post savegame conversion FS population { Binder binder; Record savedSessionModule; // GameStateFolder: manipulation, conversion, etc... (based on native class GameStateFolder) @@ -72,8 +72,8 @@ DENG2_PIMPL(SaveGames) { // Setup the GameStateFolder module. binder.init(savedSessionModule) - << DENG2_FUNC(GameStateFolder_Convert, "convert", "gameId" << "savegamePath") - << DENG2_FUNC(GameStateFolder_ConvertAll, "convertAll", "gameId"); + << DE_FUNC(GameStateFolder_Convert, "convert", "gameId" << "savegamePath") + << DE_FUNC(GameStateFolder_ConvertAll, "convertAll", "gameId"); ScriptSystem::get().addNativeModule("SavedSession", savedSessionModule); } @@ -209,7 +209,7 @@ void SaveGames::initialize() FileIndex const &SaveGames::saveIndex() const { - return FileSystem::get().indexFor(DENG2_TYPE_NAME(GameStateFolder)); + return FileSystem::get().indexFor(DE_TYPE_NAME(GameStateFolder)); } bool SaveGames::convertLegacySavegames(String const &gameId, String const &sourcePath) @@ -267,7 +267,7 @@ SaveGames &SaveGames::get() // static D_CMD(InspectSavegame) { - DENG2_UNUSED2(src, argc); + DE_UNUSED(src, argc); String savePath = argv[1]; diff --git a/doomsday/apps/libdoomsday/src/uri.cpp b/doomsday/apps/libdoomsday/src/uri.cpp index 6d8f741c08..7209b7c932 100644 --- a/doomsday/apps/libdoomsday/src/uri.cpp +++ b/doomsday/apps/libdoomsday/src/uri.cpp @@ -60,7 +60,7 @@ static String extractScheme(String &stringWithScheme) return scheme; } -DENG2_PIMPL_NOREF(Uri) +DE_PIMPL_NOREF(Uri) { Path path; ///< Path of the Uri. @@ -377,7 +377,7 @@ String const &Uri::resolvedRef() const { void *currentGame = (void *) (!App::appExists() || DoomsdayApp::game().isNull()? 0 : &DoomsdayApp::game()); -#ifndef LIBDENG_DISABLE_URI_RESOLVE_CACHING +#ifndef DE_DISABLE_URI_RESOLVE_CACHING if (d->resolvedForGame && d->resolvedForGame == currentGame) { // We can just return the previously prepared resolved URI. @@ -390,7 +390,7 @@ String const &Uri::resolvedRef() const // Keep a copy of this, we'll likely need it many, many times. d->resolvedPath = d->resolve(); - DENG2_ASSERT(d->resolvedPath.separator() == QChar('/')); + DE_ASSERT(d->resolvedPath.separator() == QChar('/')); d->resolvedForGame = currentGame; @@ -514,24 +514,24 @@ void Uri::writeUri(writer_s *writer, int omitComponents) const } #ifdef _DEBUG -# if !defined (DENG_MOBILE) +# if !defined (DE_MOBILE) -LIBDENG_DEFINE_UNITTEST(Uri) +DE_DEFINE_UNITTEST(Uri) { try { // Test emptiness. { Uri u; - DENG_ASSERT(u.isEmpty()); - DENG_ASSERT(u.path().segmentCount() == 1); + DE_ASSERT(u.isEmpty()); + DE_ASSERT(u.path().segmentCount() == 1); } // Test a zero-length path. { Uri u("", RC_NULL); - DENG_ASSERT(u.isEmpty()); - DENG_ASSERT(u.path().segmentCount() == 1); + DE_ASSERT(u.isEmpty()); + DE_ASSERT(u.path().segmentCount() == 1); } // Equality and copying. @@ -539,16 +539,16 @@ LIBDENG_DEFINE_UNITTEST(Uri) Uri a("some/thing", RC_NULL); Uri b("/other/thing", RC_NULL); - DENG_ASSERT(a != b); + DE_ASSERT(a != b); Uri c = a; - DENG_ASSERT(c == a); - DENG_ASSERT(c.path().reverseSegment(1).toString() == "some"); + DE_ASSERT(c == a); + DE_ASSERT(c.path().reverseSegment(1).toString() == "some"); b = a; - DENG_ASSERT(b == a); + DE_ASSERT(b == a); //qDebug() << b.reverseSegment(1); - DENG_ASSERT(b.path().reverseSegment(1).toString() == "some"); + DE_ASSERT(b.path().reverseSegment(1).toString() == "some"); } // Swapping. @@ -556,54 +556,54 @@ LIBDENG_DEFINE_UNITTEST(Uri) Uri a("a/b/c", RC_NULL); Uri b("d/e", RC_NULL); - DENG_ASSERT(a.path().segmentCount() == 3); - DENG_ASSERT(a.path().reverseSegment(1).toString() == "b"); + DE_ASSERT(a.path().segmentCount() == 3); + DE_ASSERT(a.path().reverseSegment(1).toString() == "b"); std::swap(a, b); - DENG_ASSERT(a.path().segmentCount() == 2); - DENG_ASSERT(a.path().reverseSegment(1).toString() == "d"); - DENG_ASSERT(b.path().segmentCount() == 3); - DENG_ASSERT(b.path().reverseSegment(1).toString() == "b"); + DE_ASSERT(a.path().segmentCount() == 2); + DE_ASSERT(a.path().reverseSegment(1).toString() == "d"); + DE_ASSERT(b.path().segmentCount() == 3); + DE_ASSERT(b.path().reverseSegment(1).toString() == "b"); } // Test a Windows style path with a drive plus file path. { Uri u("c:/something.ext", RC_NULL); - DENG_ASSERT(u.path().segmentCount() == 2); + DE_ASSERT(u.path().segmentCount() == 2); - DENG_ASSERT(u.path().reverseSegment(0).length() == 13); - DENG_ASSERT(u.path().reverseSegment(0).toString() == "something.ext"); + DE_ASSERT(u.path().reverseSegment(0).length() == 13); + DE_ASSERT(u.path().reverseSegment(0).toString() == "something.ext"); - DENG_ASSERT(u.path().reverseSegment(1).length() == 2); - DENG_ASSERT(u.path().reverseSegment(1).toString() == "c:"); + DE_ASSERT(u.path().reverseSegment(1).length() == 2); + DE_ASSERT(u.path().reverseSegment(1).toString() == "c:"); } // Test a Unix style path with a zero-length root node name. { Uri u("/something.ext", RC_NULL); - DENG_ASSERT(u.path().segmentCount() == 2); + DE_ASSERT(u.path().segmentCount() == 2); - DENG_ASSERT(u.path().reverseSegment(0).length() == 13); - DENG_ASSERT(u.path().reverseSegment(0).toString() == "something.ext"); + DE_ASSERT(u.path().reverseSegment(0).length() == 13); + DE_ASSERT(u.path().reverseSegment(0).toString() == "something.ext"); - DENG_ASSERT(u.path().reverseSegment(1).length() == 0); - DENG_ASSERT(u.path().reverseSegment(1).toString() == ""); + DE_ASSERT(u.path().reverseSegment(1).length() == 0); + DE_ASSERT(u.path().reverseSegment(1).toString() == ""); } // Test a relative directory. { Uri u("some/dir/structure/", RC_NULL); - DENG_ASSERT(u.path().segmentCount() == 3); + DE_ASSERT(u.path().segmentCount() == 3); - DENG_ASSERT(u.path().reverseSegment(0).length() == 9); - DENG_ASSERT(u.path().reverseSegment(0).toString() == "structure"); + DE_ASSERT(u.path().reverseSegment(0).length() == 9); + DE_ASSERT(u.path().reverseSegment(0).toString() == "structure"); - DENG_ASSERT(u.path().reverseSegment(1).length() == 3); - DENG_ASSERT(u.path().reverseSegment(1).toString() == "dir"); + DE_ASSERT(u.path().reverseSegment(1).length() == 3); + DE_ASSERT(u.path().reverseSegment(1).toString() == "dir"); - DENG_ASSERT(u.path().reverseSegment(2).length() == 4); - DENG_ASSERT(u.path().reverseSegment(2).toString() == "some"); + DE_ASSERT(u.path().reverseSegment(2).length() == 4); + DE_ASSERT(u.path().reverseSegment(2).toString() == "some"); } } catch (Error const &er) @@ -614,9 +614,9 @@ LIBDENG_DEFINE_UNITTEST(Uri) return true; } -LIBDENG_RUN_UNITTEST(Uri) +DE_RUN_UNITTEST(Uri) -# endif // DENG_MOBILE +# endif // DE_MOBILE #endif // _DEBUG } // namespace de diff --git a/doomsday/apps/libdoomsday/src/world/dmuargs.cpp b/doomsday/apps/libdoomsday/src/world/dmuargs.cpp index 4f301bdb09..a45c1dd908 100644 --- a/doomsday/apps/libdoomsday/src/world/dmuargs.cpp +++ b/doomsday/apps/libdoomsday/src/world/dmuargs.cpp @@ -80,7 +80,7 @@ DmuArgs::DmuArgs(int type, uint prop) , angleValues (0) , ptrValues (0) { - DENG_ASSERT(VALID_DMU_ELEMENT_TYPE_ID(type)); + DE_ASSERT(VALID_DMU_ELEMENT_TYPE_ID(type)); } void DmuArgs::value(valuetype_t dstValueType, void *dst, uint index) const @@ -543,7 +543,7 @@ void DmuArgs::setValue(valuetype_t srcValueType, void const *src, uint index) case DDVT_INT: // Attempt automatic conversion using P_ToIndex(). Naturally only // works with map elements. Failure leads into a fatal error. - DENG_ASSERT(ptrToIndexFunc); + DE_ASSERT(ptrToIndexFunc); intValues[index] = ptrToIndexFunc(*s); break; case DDVT_PTR: diff --git a/doomsday/apps/libdoomsday/src/world/entitydatabase.cpp b/doomsday/apps/libdoomsday/src/world/entitydatabase.cpp index d0ffcd330d..3a4a02a5e0 100644 --- a/doomsday/apps/libdoomsday/src/world/entitydatabase.cpp +++ b/doomsday/apps/libdoomsday/src/world/entitydatabase.cpp @@ -36,7 +36,7 @@ typedef std::map Entities; // Entities are grouped in sets by their unique identifier. typedef std::map EntitySet; -DENG2_PIMPL(EntityDatabase) +DE_PIMPL(EntityDatabase) { EntitySet entitySets; @@ -45,9 +45,9 @@ DENG2_PIMPL(EntityDatabase) ~Impl() { - DENG2_FOR_EACH(EntitySet, setIt, entitySets) - DENG2_FOR_EACH(Entities, entityIt, setIt->second) - DENG2_FOR_EACH(Entity, propIt, entityIt->second) + DE_FOR_EACH(EntitySet, setIt, entitySets) + DE_FOR_EACH(Entities, entityIt, setIt->second) + DE_FOR_EACH(Entity, propIt, entityIt->second) { delete propIt->second; } @@ -106,14 +106,14 @@ EntityDatabase::EntityDatabase() : d(new Impl(this)) uint EntityDatabase::entityCount(MapEntityDef const *entityDef) const { - DENG2_ASSERT(entityDef); + DE_ASSERT(entityDef); Entities *set = d->entities(entityDef->id); return set->size(); } bool EntityDatabase::hasEntity(MapEntityDef const *entityDef, int elementIndex) const { - DENG2_ASSERT(entityDef); + DE_ASSERT(entityDef); Entities *set = d->entities(entityDef->id); return d->entityByElementIndex(*set, elementIndex, false /*do not create*/) != 0; } @@ -121,7 +121,7 @@ bool EntityDatabase::hasEntity(MapEntityDef const *entityDef, int elementIndex) PropertyValue const &EntityDatabase::property(MapEntityPropertyDef const *def, int elementIndex) const { - DENG2_ASSERT(def); + DE_ASSERT(def); if (auto const *propValue = d->tryFindPropertyValue(*def, elementIndex)) { return *propValue; @@ -135,14 +135,14 @@ PropertyValue const &EntityDatabase::property(MapEntityPropertyDef const *def, bool EntityDatabase::hasPropertyValue(MapEntityPropertyDef const *def, int elementIndex) const { - DENG2_ASSERT(def); + DE_ASSERT(def); return d->tryFindPropertyValue(*def, elementIndex) != nullptr; } void EntityDatabase::setProperty(MapEntityPropertyDef const *def, int elementIndex, PropertyValue *value) { - DENG2_ASSERT(def); + DE_ASSERT(def); Entities *set = d->entities(def->entity->id); Entity *entity = d->entityByElementIndex(*set, elementIndex, true); if (!entity) diff --git a/doomsday/apps/libdoomsday/src/world/entitydef.cpp b/doomsday/apps/libdoomsday/src/world/entitydef.cpp index 48292b2106..0eb0e5f207 100644 --- a/doomsday/apps/libdoomsday/src/world/entitydef.cpp +++ b/doomsday/apps/libdoomsday/src/world/entitydef.cpp @@ -47,7 +47,7 @@ static void clearEntityDefs() ::entityDefs->forAll([] (StringPool::Id id) { auto *def = static_cast( ::entityDefs->userPointer(id) ); - DENG2_ASSERT(def); + DE_ASSERT(def); for (duint i = 0; i < def->numProps; ++i) { M_Free(def->props[i].name); @@ -104,7 +104,7 @@ AutoStr *P_NameForMapEntityDef(MapEntityDef const *def) int MapEntityDef_Property(MapEntityDef *def, int propertyId, MapEntityPropertyDef **retDef = 0) { - DENG2_ASSERT(def); + DE_ASSERT(def); MapEntityPropertyDef *found = 0; for (uint i = 0; i < def->numProps; ++i) { @@ -122,7 +122,7 @@ int MapEntityDef_Property(MapEntityDef *def, int propertyId, int MapEntityDef_PropertyByName(MapEntityDef *def, char const *propertyName, MapEntityPropertyDef **retDef) { - DENG2_ASSERT(def); + DE_ASSERT(def); MapEntityPropertyDef *found = 0; if (propertyName && propertyName[0]) { @@ -143,7 +143,7 @@ int MapEntityDef_PropertyByName(MapEntityDef *def, char const *propertyName, void MapEntityDef_AddProperty(MapEntityDef* def, int propertyId, const char* propertyName, valuetype_t type) { - DENG2_ASSERT(def); + DE_ASSERT(def); if (propertyId == 0) // Not a valid identifier. throw Error("MapEntityDef_AddProperty", "0 is not a valid propertyId"); @@ -246,12 +246,12 @@ static MapEntityDef *findMapEntityDef(int identifier, char const *entityName, return def; } -DENG_EXTERN_C dd_bool P_RegisterMapObj(int identifier, char const *name) +DE_EXTERN_C dd_bool P_RegisterMapObj(int identifier, char const *name) { return findMapEntityDef(identifier, name, true /*do create*/) != 0; } -DENG_EXTERN_C dd_bool P_RegisterMapObjProperty(int entityId, int propertyId, +DE_EXTERN_C dd_bool P_RegisterMapObjProperty(int entityId, int propertyId, char const *propertyName, valuetype_t type) { try @@ -343,37 +343,37 @@ Type getEntityValue(int entityId, int elementIndex, int propertyId) } } -DENG_EXTERN_C byte P_GetGMOByte(int entityId, int elementIndex, int propertyId) +DE_EXTERN_C byte P_GetGMOByte(int entityId, int elementIndex, int propertyId) { return getEntityValue(entityId, elementIndex, propertyId); } -DENG_EXTERN_C short P_GetGMOShort(int entityId, int elementIndex, int propertyId) +DE_EXTERN_C short P_GetGMOShort(int entityId, int elementIndex, int propertyId) { return getEntityValue(entityId, elementIndex, propertyId); } -DENG_EXTERN_C int P_GetGMOInt(int entityId, int elementIndex, int propertyId) +DE_EXTERN_C int P_GetGMOInt(int entityId, int elementIndex, int propertyId) { return getEntityValue(entityId, elementIndex, propertyId); } -DENG_EXTERN_C fixed_t P_GetGMOFixed(int entityId, int elementIndex, int propertyId) +DE_EXTERN_C fixed_t P_GetGMOFixed(int entityId, int elementIndex, int propertyId) { return getEntityValue(entityId, elementIndex, propertyId); } -DENG_EXTERN_C angle_t P_GetGMOAngle(int entityId, int elementIndex, int propertyId) +DE_EXTERN_C angle_t P_GetGMOAngle(int entityId, int elementIndex, int propertyId) { return getEntityValue(entityId, elementIndex, propertyId); } -DENG_EXTERN_C float P_GetGMOFloat(int entityId, int elementIndex, int propertyId) +DE_EXTERN_C float P_GetGMOFloat(int entityId, int elementIndex, int propertyId) { return getEntityValue(entityId, elementIndex, propertyId); } -DENG_EXTERN_C double P_GetGMODouble(int entityId, int elementIndex, int propertyId) +DE_EXTERN_C double P_GetGMODouble(int entityId, int elementIndex, int propertyId) { return getEntityValue(entityId, elementIndex, propertyId); } diff --git a/doomsday/apps/libdoomsday/src/world/map.cpp b/doomsday/apps/libdoomsday/src/world/map.cpp index 870e8320a8..fabda60ba9 100644 --- a/doomsday/apps/libdoomsday/src/world/map.cpp +++ b/doomsday/apps/libdoomsday/src/world/map.cpp @@ -24,8 +24,8 @@ using namespace de; namespace world { -DENG2_PIMPL(BaseMap) -, DENG2_OBSERVES(Record, Deletion) +DE_PIMPL(BaseMap) +, DE_OBSERVES(Record, Deletion) { EntityDatabase entityDatabase; res::MapManifest *manifest = nullptr; ///< Not owned, may be @c nullptr. @@ -35,7 +35,7 @@ DENG2_PIMPL(BaseMap) ~Impl() { - DENG2_FOR_PUBLIC_AUDIENCE2(Deletion, i) i->mapBeingDeleted(self()); + DE_FOR_PUBLIC_AUDIENCE2(Deletion, i) i->mapBeingDeleted(self()); } void recordBeingDeleted(Record &record) @@ -47,10 +47,10 @@ DENG2_PIMPL(BaseMap) } } - DENG2_PIMPL_AUDIENCE(Deletion) + DE_PIMPL_AUDIENCE(Deletion) }; -DENG2_AUDIENCE_METHOD(BaseMap, Deletion) +DE_AUDIENCE_METHOD(BaseMap, Deletion) BaseMap::BaseMap(res::MapManifest *manifest) : d(new Impl(this)) { @@ -75,7 +75,7 @@ res::MapManifest &BaseMap::manifest() const { if (hasManifest()) { - DENG2_ASSERT(d->manifest != nullptr); + DE_ASSERT(d->manifest != nullptr); return *d->manifest; } /// @throw MissingResourceManifestError No associated resource manifest. diff --git a/doomsday/apps/libdoomsday/src/world/mapelement.cpp b/doomsday/apps/libdoomsday/src/world/mapelement.cpp index 0d390615bb..953596a293 100644 --- a/doomsday/apps/libdoomsday/src/world/mapelement.cpp +++ b/doomsday/apps/libdoomsday/src/world/mapelement.cpp @@ -25,7 +25,7 @@ using namespace de; namespace world { -DENG2_PIMPL_NOREF(MapElement) +DE_PIMPL_NOREF(MapElement) { dint type; Map *map = nullptr; diff --git a/doomsday/apps/libdoomsday/src/world/material.cpp b/doomsday/apps/libdoomsday/src/world/material.cpp index caffba5636..830851fc54 100644 --- a/doomsday/apps/libdoomsday/src/world/material.cpp +++ b/doomsday/apps/libdoomsday/src/world/material.cpp @@ -65,7 +65,7 @@ String Material::Layer::describe() const String Material::Layer::description() const { int const numStages = stageCount(); - String str = _E(b) + describe() + _E(.) + " (" + String::number(numStages) + " stage" + DENG2_PLURAL_S(numStages) + "):"; + String str = _E(b) + describe() + _E(.) + " (" + String::number(numStages) + " stage" + DE_PLURAL_S(numStages) + "):"; for (int i = 0; i < numStages; ++i) { str += String("\n [%1] ").arg(i, 2) + _E(>) + stage(i).description() + _E(<); @@ -75,9 +75,9 @@ String Material::Layer::description() const // ------------------------------------------------------------------------------------ -DENG2_PIMPL(Material) -, DENG2_OBSERVES(res::Texture, Deletion) -, DENG2_OBSERVES(res::Texture, DimensionsChange) +DE_PIMPL(Material) +, DE_OBSERVES(res::Texture, Deletion) +, DE_OBSERVES(res::Texture, DimensionsChange) { MaterialManifest *manifest = nullptr; ///< Source manifest (always valid, not owned). Vec2ui dimensions; ///< World dimensions in map coordinate space units. @@ -152,7 +152,7 @@ DENG2_PIMPL(Material) // Observes Texture DimensionsChange. void textureDimensionsChanged(res::Texture const &texture) { - DENG2_ASSERT(!haveValidDimensions()); // Sanity check. + DE_ASSERT(!haveValidDimensions()); // Sanity check. self().setDimensions(texture.dimensions()); } @@ -162,23 +162,23 @@ DENG2_PIMPL(Material) // If here it means the texture we were planning to inherit dimensions from is // being deleted and therefore we won't be able to. - DENG2_ASSERT(!haveValidDimensions()); // Sanity check. - DENG2_ASSERT(inheritDimensionsTexture() == &texture); // Sanity check. + DE_ASSERT(!haveValidDimensions()); // Sanity check. + DE_ASSERT(inheritDimensionsTexture() == &texture); // Sanity check. /// @todo kludge: Clear the association so we don't try to cancel notifications later. firstTextureLayer()->stage(0).texture = de::Uri(); -#if !defined(DENG2_DEBUG) - DENG2_UNUSED(texture); +#if !defined(DE_DEBUG) + DE_UNUSED(texture); #endif } - DENG2_PIMPL_AUDIENCE(Deletion) - DENG2_PIMPL_AUDIENCE(DimensionsChange) + DE_PIMPL_AUDIENCE(Deletion) + DE_PIMPL_AUDIENCE(DimensionsChange) }; -DENG2_AUDIENCE_METHOD(Material, Deletion) -DENG2_AUDIENCE_METHOD(Material, DimensionsChange) +DE_AUDIENCE_METHOD(Material, Deletion) +DE_AUDIENCE_METHOD(Material, DimensionsChange) Material::Material(MaterialManifest &manifest) : MapElement(DMU_MATERIAL) @@ -191,12 +191,12 @@ Material::~Material() { d->maybeCancelTextureDimensionsChangeNotification(); - DENG2_FOR_AUDIENCE2(Deletion, i) i->materialBeingDeleted(*this); + DE_FOR_AUDIENCE2(Deletion, i) i->materialBeingDeleted(*this); } MaterialManifest &Material::manifest() const { - DENG2_ASSERT(d->manifest); + DE_ASSERT(d->manifest); return *d->manifest; } @@ -213,7 +213,7 @@ void Material::setDimensions(Vec2ui const &newDimensions) d->maybeCancelTextureDimensionsChangeNotification(); // Notify interested parties. - DENG2_FOR_AUDIENCE2(DimensionsChange, i) i->materialDimensionsChanged(*this); + DE_FOR_AUDIENCE2(DimensionsChange, i) i->materialDimensionsChanged(*this); } } @@ -305,8 +305,8 @@ String Material::description() const { String str = String(_E(l) "Dimensions: ") + _E(.) + (d->haveValidDimensions()? dimensions().asText() : "unknown (not yet prepared)") + _E(l) + " Source: " + _E(.) + manifest().sourceDescription() - + _E(l) + "\nDrawable: " + _E(.) + DENG2_BOOL_YESNO(isDrawable()) - + _E(l) + " SkyMasked: " + _E(.) + DENG2_BOOL_YESNO(isSkyMasked()); + + _E(l) + "\nDrawable: " + _E(.) + DE_BOOL_YESNO(isDrawable()) + + _E(l) + " SkyMasked: " + _E(.) + DE_BOOL_YESNO(isSkyMasked()); // Add the layer config: for (Layer const *layer : _layers) @@ -344,7 +344,7 @@ int Material::property(DmuArgs &args) const D_CMD(InspectMaterial) { - DENG2_UNUSED(src); + DE_UNUSED(src); de::Uri search = de::Uri::fromUserInput(&argv[1], argc - 1); if (!search.scheme().isEmpty() && diff --git a/doomsday/apps/libdoomsday/src/world/materialarchive.cpp b/doomsday/apps/libdoomsday/src/world/materialarchive.cpp index 372006a588..bfa11e104f 100644 --- a/doomsday/apps/libdoomsday/src/world/materialarchive.cpp +++ b/doomsday/apps/libdoomsday/src/world/materialarchive.cpp @@ -116,7 +116,7 @@ static Material *findRecordMaterial(Records &records, SerialId id) return reinterpret_cast(records.userPointer(id)); } -DENG2_PIMPL(MaterialArchive) +DE_PIMPL(MaterialArchive) { int version = MATERIALARCHIVE_VERSION; @@ -165,7 +165,7 @@ DENG2_PIMPL(MaterialArchive) void readGroup(reader_s &reader) { - DENG_ASSERT(version >= 1); + DE_ASSERT(version >= 1); // Read the group header. int num = Reader_ReadUInt16(&reader); @@ -329,7 +329,7 @@ void MaterialArchive::read(reader_s &reader, int forcedVersion) * C Wrapper API: */ -#define DENG_NO_API_MACROS_MATERIAL_ARCHIVE +#define DE_NO_API_MACROS_MATERIAL_ARCHIVE #include "api_materialarchive.h" @@ -340,11 +340,11 @@ void MaterialArchive::read(reader_s &reader, int forcedVersion) reinterpret_cast(inst) #define SELF(inst) \ - DENG2_ASSERT(inst); \ + DE_ASSERT(inst); \ de::MaterialArchive *self = TOINTERNAL(inst) #define SELF_CONST(inst) \ - DENG2_ASSERT(inst); \ + DE_ASSERT(inst); \ de::MaterialArchive const *self = TOINTERNAL_CONST(inst) #undef MaterialArchive_New diff --git a/doomsday/apps/libdoomsday/src/world/materialmanifest.cpp b/doomsday/apps/libdoomsday/src/world/materialmanifest.cpp index 94abcc5730..4a13d8d06a 100644 --- a/doomsday/apps/libdoomsday/src/world/materialmanifest.cpp +++ b/doomsday/apps/libdoomsday/src/world/materialmanifest.cpp @@ -27,8 +27,8 @@ namespace world { static MaterialManifest::MaterialConstructor materialConstructor; -DENG2_PIMPL_NOREF(MaterialManifest) -, DENG2_OBSERVES(Material, Deletion) +DE_PIMPL_NOREF(MaterialManifest) +, DE_OBSERVES(Material, Deletion) { MaterialScheme *ownerScheme = nullptr; Flags flags; ///< Classification flags. @@ -48,20 +48,20 @@ MaterialManifest::MaterialManifest(PathTree::NodeArgs const &args) MaterialManifest::~MaterialManifest() { - DENG2_FOR_AUDIENCE(Deletion, i) i->materialManifestBeingDeleted(*this); + DE_FOR_AUDIENCE(Deletion, i) i->materialManifestBeingDeleted(*this); } Material *MaterialManifest::derive() { if (!hasMaterial()) { - DENG_ASSERT(materialConstructor); + DE_ASSERT(materialConstructor); // Instantiate and associate the new material with this. setMaterial(materialConstructor(*this)); // Notify interested parties that a new material was derived from the manifest. - DENG2_FOR_AUDIENCE(MaterialDerived, i) i->materialManifestMaterialDerived(*this, material()); + DE_FOR_AUDIENCE(MaterialDerived, i) i->materialManifestMaterialDerived(*this, material()); } return &material(); } @@ -83,7 +83,7 @@ void MaterialManifest::setId(materialid_t id) MaterialScheme &MaterialManifest::scheme() const { - DENG_ASSERT(d->ownerScheme); + DE_ASSERT(d->ownerScheme); return *d->ownerScheme; } diff --git a/doomsday/apps/libdoomsday/src/world/materials.cpp b/doomsday/apps/libdoomsday/src/world/materials.cpp index d620cd3d99..545d150d83 100644 --- a/doomsday/apps/libdoomsday/src/world/materials.cpp +++ b/doomsday/apps/libdoomsday/src/world/materials.cpp @@ -44,11 +44,11 @@ uint qHash(SchemeHashKey const &key) return key.scheme.at(1).toLower().unicode(); } -DENG2_PIMPL(Materials) -, DENG2_OBSERVES(MaterialScheme, ManifestDefined) -, DENG2_OBSERVES(MaterialManifest, MaterialDerived) -, DENG2_OBSERVES(MaterialManifest, Deletion) -, DENG2_OBSERVES(Material, Deletion) +DE_PIMPL(Materials) +, DE_OBSERVES(MaterialScheme, ManifestDefined) +, DE_OBSERVES(MaterialManifest, MaterialDerived) +, DE_OBSERVES(MaterialManifest, Deletion) +, DE_OBSERVES(Material, Deletion) { /// System subspace schemes containing the manifests/resources. QHash materialSchemes; @@ -98,7 +98,7 @@ DENG2_PIMPL(Materials) void createMaterialScheme(String name) { - DENG2_ASSERT(name.length() >= MaterialScheme::min_name_length); + DE_ASSERT(name.length() >= MaterialScheme::min_name_length); // Create a new scheme. MaterialScheme *newScheme = new MaterialScheme(name); @@ -216,7 +216,7 @@ MaterialManifest &Materials::toMaterialManifest(materialid_t id) const return *d->materialManifestIdMap[idx]; } // Internal bookeeping error. - DENG2_ASSERT(false); + DE_ASSERT(false); } /// @throw InvalidMaterialIdError The specified material id is invalid. throw UnknownMaterialIdError("Materials::toMaterialManifest", @@ -347,7 +347,7 @@ void Materials::clearAllMaterialSchemes() scheme.clear(); return LoopContinue; }); - DENG2_ASSERT(materialCount() == 0); // sanity check + DE_ASSERT(materialCount() == 0); // sanity check } Materials &Materials::get() // static diff --git a/doomsday/apps/libdoomsday/src/world/materialscheme.cpp b/doomsday/apps/libdoomsday/src/world/materialscheme.cpp index a57d9c49f9..10884bd461 100644 --- a/doomsday/apps/libdoomsday/src/world/materialscheme.cpp +++ b/doomsday/apps/libdoomsday/src/world/materialscheme.cpp @@ -24,7 +24,7 @@ using namespace de; namespace world { -DENG2_PIMPL(MaterialScheme) +DE_PIMPL(MaterialScheme) { /// Symbolic name of the scheme. String name; @@ -38,7 +38,7 @@ DENG2_PIMPL(MaterialScheme) ~Impl() { self().clear(); - DENG2_ASSERT(index.isEmpty()); + DE_ASSERT(index.isEmpty()); } }; @@ -68,14 +68,14 @@ MaterialManifest &MaterialScheme::declare(Path const &path) int const sizeBefore = d->index.size(); Manifest *newManifest = &d->index.insert(path); - DENG2_ASSERT(newManifest); + DE_ASSERT(newManifest); newManifest->setScheme(*this); if (d->index.size() != sizeBefore) { // Notify interested parties that a new manifest was defined in the scheme. - DENG2_FOR_AUDIENCE(ManifestDefined, i) i->materialSchemeManifestDefined(*this, *newManifest); + DE_FOR_AUDIENCE(ManifestDefined, i) i->materialSchemeManifestDefined(*this, *newManifest); } return *newManifest; diff --git a/doomsday/apps/libdoomsday/src/world/mobjthinkerdata.cpp b/doomsday/apps/libdoomsday/src/world/mobjthinkerdata.cpp index d6dc3cf417..a1b71a0475 100644 --- a/doomsday/apps/libdoomsday/src/world/mobjthinkerdata.cpp +++ b/doomsday/apps/libdoomsday/src/world/mobjthinkerdata.cpp @@ -26,7 +26,7 @@ using namespace de; static String const VAR_ID("__id__"); -DENG2_PIMPL_NOREF(MobjThinkerData) +DE_PIMPL_NOREF(MobjThinkerData) {}; MobjThinkerData::MobjThinkerData(de::Id const &id) diff --git a/doomsday/apps/libdoomsday/src/world/propertyvalue.cpp b/doomsday/apps/libdoomsday/src/world/propertyvalue.cpp index fd2c602149..422f13bef3 100644 --- a/doomsday/apps/libdoomsday/src/world/propertyvalue.cpp +++ b/doomsday/apps/libdoomsday/src/world/propertyvalue.cpp @@ -26,7 +26,7 @@ using namespace de; PropertyValue *BuildPropertyValue(valuetype_t type, void *valueAdr) { - DENG2_ASSERT(valueAdr != 0); + DE_ASSERT(valueAdr != 0); switch (type) { case DDVT_BYTE: return new PropertyByteValue (*( (byte *) valueAdr)); diff --git a/doomsday/apps/libdoomsday/src/world/thinker.cpp b/doomsday/apps/libdoomsday/src/world/thinker.cpp index a923aa2157..e6866d91ce 100644 --- a/doomsday/apps/libdoomsday/src/world/thinker.cpp +++ b/doomsday/apps/libdoomsday/src/world/thinker.cpp @@ -25,7 +25,7 @@ using namespace de; -DENG2_PIMPL_NOREF(Thinker) +DE_PIMPL_NOREF(Thinker) { dsize size; thinker_s *base; // owned @@ -140,7 +140,7 @@ Thinker::Thinker(thinker_s const &podThinker, dsize sizeInBytes, AllocMethod all : d(new Impl(alloc, sizeInBytes, 0)) , STRUCT_MEMBER_ACCESSORS() { - DENG2_ASSERT(d->size == sizeInBytes); + DE_ASSERT(d->size == sizeInBytes); memcpy(d->base, &podThinker, sizeInBytes); // Retain the original allocation flag, though. @@ -199,13 +199,13 @@ bool Thinker::hasData() const Thinker::IData &Thinker::data() { - DENG2_ASSERT(hasData()); + DE_ASSERT(hasData()); return *d->data; } Thinker::IData const &Thinker::data() const { - DENG2_ASSERT(hasData()); + DE_ASSERT(hasData()); return *d->data; } @@ -216,7 +216,7 @@ dsize Thinker::sizeInBytes() const thinker_s *Thinker::take() { - DENG2_ASSERT(d->base->d == d->data); + DE_ASSERT(d->base->d == d->data); thinker_s *th = d->base; d->relinquish(); @@ -225,7 +225,7 @@ thinker_s *Thinker::take() void Thinker::destroy(thinker_s *thinkerBase) { - DENG2_ASSERT(thinkerBase != 0); + DE_ASSERT(thinkerBase != 0); release(*thinkerBase); diff --git a/doomsday/apps/libdoomsday/src/world/thinkerdata.cpp b/doomsday/apps/libdoomsday/src/world/thinkerdata.cpp index 70594c7bfe..52ee0edc2a 100644 --- a/doomsday/apps/libdoomsday/src/world/thinkerdata.cpp +++ b/doomsday/apps/libdoomsday/src/world/thinkerdata.cpp @@ -26,7 +26,7 @@ using namespace de; static QMultiHash thinkerLookup; -DENG2_PIMPL(ThinkerData) +DE_PIMPL(ThinkerData) { thinker_s *think; Id id; ///< Internal unique ID. @@ -49,16 +49,16 @@ DENG2_PIMPL(ThinkerData) { thinkerLookup.remove(id, &self()); - DENG2_FOR_PUBLIC_AUDIENCE2(Deletion, i) + DE_FOR_PUBLIC_AUDIENCE2(Deletion, i) { i->thinkerBeingDeleted(*think); } } - DENG2_PIMPL_AUDIENCE(Deletion) + DE_PIMPL_AUDIENCE(Deletion) }; -DENG2_AUDIENCE_METHOD(ThinkerData, Deletion) +DE_AUDIENCE_METHOD(ThinkerData, Deletion) ThinkerData::ThinkerData(Id const &id) : d(new Impl(this, id)) @@ -107,13 +107,13 @@ Thinker::IData *ThinkerData::duplicate() const thinker_s &ThinkerData::thinker() { - DENG2_ASSERT(d->think != 0); + DE_ASSERT(d->think != 0); return *d->think; } thinker_s const &ThinkerData::thinker() const { - DENG2_ASSERT(d->think != 0); + DE_ASSERT(d->think != 0); return *d->think; } @@ -170,7 +170,7 @@ ThinkerData *ThinkerData::find(Id const &id) return nullptr; } -#ifdef DENG2_DEBUG +#ifdef DE_DEBUG duint32 ThinkerData::DebugCounter::total = 0; ThinkerData::DebugValidator ensureAllPrivateDataIsReleased; #endif diff --git a/doomsday/apps/libdoomsday/src/world/world.cpp b/doomsday/apps/libdoomsday/src/world/world.cpp index f9ef0fa0c4..8dd721589b 100644 --- a/doomsday/apps/libdoomsday/src/world/world.cpp +++ b/doomsday/apps/libdoomsday/src/world/world.cpp @@ -31,7 +31,7 @@ using namespace world; static World *theWorld = nullptr; -DENG2_PIMPL(World) +DE_PIMPL(World) { BaseMap *map = nullptr; world::Materials materials; @@ -46,10 +46,10 @@ DENG2_PIMPL(World) theWorld = nullptr; } - DENG2_PIMPL_AUDIENCE(MapChange) + DE_PIMPL_AUDIENCE(MapChange) }; -DENG2_AUDIENCE_METHOD(World, MapChange) +DE_AUDIENCE_METHOD(World, MapChange) World::World() : d(new Impl(this)) { @@ -101,7 +101,7 @@ bool World::hasMap() const BaseMap &World::map() const { - DENG2_ASSERT(hasMap()); + DE_ASSERT(hasMap()); return *d->map; } @@ -117,11 +117,11 @@ Materials const &World::materials() const World &World::get() { - DENG2_ASSERT(theWorld); + DE_ASSERT(theWorld); return *theWorld; } void World::notifyMapChange() { - DENG2_FOR_AUDIENCE2(MapChange, i) i->worldMapChanged(); + DE_FOR_AUDIENCE2(MapChange, i) i->worldMapChanged(); } diff --git a/doomsday/apps/plugins/CMakeLists.txt b/doomsday/apps/plugins/CMakeLists.txt index 27c8e5a7e4..575bf71f66 100644 --- a/doomsday/apps/plugins/CMakeLists.txt +++ b/doomsday/apps/plugins/CMakeLists.txt @@ -41,6 +41,6 @@ endif () # Other --------------------------------------------------------------------------------- -if (DENG_DEVELOPER AND NOT IOS) +if (DE_DEVELOPER AND NOT IOS) add_subdirectory (example) endif () diff --git a/doomsday/apps/plugins/PluginConfig.cmake b/doomsday/apps/plugins/PluginConfig.cmake index 79caf5ef76..e54ba5fd44 100644 --- a/doomsday/apps/plugins/PluginConfig.cmake +++ b/doomsday/apps/plugins/PluginConfig.cmake @@ -2,7 +2,7 @@ # Copyright (c) 2015-2017 Jaakko Keränen cmake_minimum_required (VERSION 3.0) -project (DENG_PLUGINS) +project (DE_PLUGINS) include (${CMAKE_CURRENT_LIST_DIR}/../../cmake/Config.cmake) find_package (DengDoomsday) @@ -23,15 +23,15 @@ macro (deng_add_plugin target) endif () list (APPEND _src ${_winres}) endif () - if (DENG_STATIC_LINK) + if (DE_STATIC_LINK) set (_libType STATIC) else () set (_libType MODULE) endif () - add_library (${target} ${_libType} ${_src} ${DENG_RESOURCES}) + add_library (${target} ${_libType} ${_src} ${DE_RESOURCES}) target_include_directories (${target} - PUBLIC "${DENG_API_DIR}" - PRIVATE "${DENG_SOURCE_DIR}/libs/gui/include" + PUBLIC "${DE_API_DIR}" + PRIVATE "${DE_SOURCE_DIR}/libs/gui/include" ) target_link_libraries (${target} PUBLIC Deng::libdoomsday Deng::libgamefw) enable_cxx11 (${target}) @@ -55,12 +55,12 @@ macro (deng_add_plugin target) APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-braces ) set (_extraRPath) - if (NOT DENG_ENABLE_DEPLOYQT) + if (NOT DE_ENABLE_DEPLOYQT) set (_extraRPath ${QT_LIBS}) endif () set_target_properties (${target} PROPERTIES BUNDLE ON - MACOSX_BUNDLE_INFO_PLIST ${DENG_SOURCE_DIR}/cmake/MacOSXPluginBundleInfo.plist.in + MACOSX_BUNDLE_INFO_PLIST ${DE_SOURCE_DIR}/cmake/MacOSXPluginBundleInfo.plist.in BUILD_WITH_INSTALL_RPATH ON # staging prevents CMake's own rpath fixing INSTALL_RPATH "@loader_path/../Frameworks;@executable_path/../Frameworks;${_extraRPath}" ) @@ -75,7 +75,7 @@ macro (deng_add_plugin target) # This is needed because we want access to these even in a build where the # plugins are not installed yet -- the staging directory symlinks to the # individual build directories. - set (stage "${DENG_BUILD_STAGING_DIR}/DengPlugins") + set (stage "${DE_BUILD_STAGING_DIR}/DengPlugins") add_custom_command (TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory "${stage}" COMMAND ${CMAKE_COMMAND} -E create_symlink @@ -83,7 +83,7 @@ macro (deng_add_plugin target) "${stage}/${target}.bundle" ) # Fix the Qt framework install names manually. - if (DENG_ENABLE_DEPLOYQT) + if (DE_ENABLE_DEPLOYQT) deng_bundle_install_names (${target} SCRIPT_NAME "qtlibs" LD_PATH "@executable_path/../Frameworks" @@ -96,27 +96,27 @@ macro (deng_add_plugin target) deng_bundle_resources () else () set_target_properties (${target} PROPERTIES - VERSION ${DENG_VERSION} + VERSION ${DE_VERSION} ) deng_target_rpath (${target}) endif () if (MSVC) set_target_properties (${target} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_DEBUG "${DENG_VS_STAGING_DIR}/Debug/${DENG_INSTALL_PLUGIN_DIR}" - RUNTIME_OUTPUT_DIRECTORY_RELEASE "${DENG_VS_STAGING_DIR}/Release/${DENG_INSTALL_PLUGIN_DIR}" - RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${DENG_VS_STAGING_DIR}/MinSizeRel/${DENG_INSTALL_PLUGIN_DIR}" - RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${DENG_VS_STAGING_DIR}/RelWithDebInfo/${DENG_INSTALL_PLUGIN_DIR}" + RUNTIME_OUTPUT_DIRECTORY_DEBUG "${DE_VS_STAGING_DIR}/Debug/${DE_INSTALL_PLUGIN_DIR}" + RUNTIME_OUTPUT_DIRECTORY_RELEASE "${DE_VS_STAGING_DIR}/Release/${DE_INSTALL_PLUGIN_DIR}" + RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${DE_VS_STAGING_DIR}/MinSizeRel/${DE_INSTALL_PLUGIN_DIR}" + RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${DE_VS_STAGING_DIR}/RelWithDebInfo/${DE_INSTALL_PLUGIN_DIR}" - LIBRARY_OUTPUT_DIRECTORY_DEBUG "${DENG_VS_STAGING_DIR}/Debug/${DENG_INSTALL_PLUGIN_DIR}" - LIBRARY_OUTPUT_DIRECTORY_RELEASE "${DENG_VS_STAGING_DIR}/Release/${DENG_INSTALL_PLUGIN_DIR}" - LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL "${DENG_VS_STAGING_DIR}/MinSizeRel/${DENG_INSTALL_PLUGIN_DIR}" - LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${DENG_VS_STAGING_DIR}/RelWithDebInfo/${DENG_INSTALL_PLUGIN_DIR}" + LIBRARY_OUTPUT_DIRECTORY_DEBUG "${DE_VS_STAGING_DIR}/Debug/${DE_INSTALL_PLUGIN_DIR}" + LIBRARY_OUTPUT_DIRECTORY_RELEASE "${DE_VS_STAGING_DIR}/Release/${DE_INSTALL_PLUGIN_DIR}" + LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL "${DE_VS_STAGING_DIR}/MinSizeRel/${DE_INSTALL_PLUGIN_DIR}" + LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${DE_VS_STAGING_DIR}/RelWithDebInfo/${DE_INSTALL_PLUGIN_DIR}" ) endif () if (NOT APPLE) - install (TARGETS ${target} LIBRARY DESTINATION ${DENG_INSTALL_PLUGIN_DIR}) + install (TARGETS ${target} LIBRARY DESTINATION ${DE_INSTALL_PLUGIN_DIR}) endif () set (_src) set (_script) diff --git a/doomsday/apps/plugins/common/include/acs/module.h b/doomsday/apps/plugins/common/include/acs/module.h index 84ab8b44ae..b985221356 100644 --- a/doomsday/apps/plugins/common/include/acs/module.h +++ b/doomsday/apps/plugins/common/include/acs/module.h @@ -35,18 +35,18 @@ namespace acs { */ class Module { - DENG2_NO_COPY (Module) - DENG2_NO_ASSIGN(Module) + DE_NO_COPY (Module) + DE_NO_ASSIGN(Module) public: /// Base class for bytecode format errors. @ingroup errors - DENG2_ERROR(FormatError); + DE_ERROR(FormatError); /// Required/referenced constant (string-)value is missing. @ingroup errors - DENG2_ERROR(MissingConstantError); + DE_ERROR(MissingConstantError); /// Required/referenced (script) entry point data is missing. @ingroup errors - DENG2_ERROR(MissingEntryPointError); + DE_ERROR(MissingEntryPointError); /** * Stores information about an ACS script entry point. @@ -110,7 +110,7 @@ class Module private: Module(); - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace acs diff --git a/doomsday/apps/plugins/common/include/acs/script.h b/doomsday/apps/plugins/common/include/acs/script.h index 26935f4a15..83e7ec5322 100644 --- a/doomsday/apps/plugins/common/include/acs/script.h +++ b/doomsday/apps/plugins/common/include/acs/script.h @@ -154,7 +154,7 @@ class Script void setState(State newState); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace acs diff --git a/doomsday/apps/plugins/common/include/acs/system.h b/doomsday/apps/plugins/common/include/acs/system.h index 50656e0c0a..071518e80e 100644 --- a/doomsday/apps/plugins/common/include/acs/system.h +++ b/doomsday/apps/plugins/common/include/acs/system.h @@ -50,7 +50,7 @@ class System public: /// Required/referenced script is missing. @ingroup errors - DENG2_ERROR(MissingScriptError); + DE_ERROR(MissingScriptError); public: System(); @@ -138,7 +138,7 @@ class System static void consoleRegister(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace acs diff --git a/doomsday/apps/plugins/common/include/d_net.h b/doomsday/apps/plugins/common/include/d_net.h index 765b2d6277..f0c73e3bb7 100644 --- a/doomsday/apps/plugins/common/include/d_net.h +++ b/doomsday/apps/plugins/common/include/d_net.h @@ -186,9 +186,9 @@ enum { #define CMDF_BTN_SUICIDE 0x10 // Now ignored in ticcmds // Console commands. -DENG_EXTERN_C ccmdtemplate_t netCCmds[]; +DE_EXTERN_C ccmdtemplate_t netCCmds[]; -DENG_EXTERN_C float netJumpPower; +DE_EXTERN_C float netJumpPower; #ifdef __cplusplus extern "C" { diff --git a/doomsday/apps/plugins/common/include/d_netsv.h b/doomsday/apps/plugins/common/include/d_netsv.h index 3a8294ca0c..b47a1cdb20 100644 --- a/doomsday/apps/plugins/common/include/d_netsv.h +++ b/doomsday/apps/plugins/common/include/d_netsv.h @@ -24,11 +24,11 @@ #include #include "common.h" -DENG_EXTERN_C char cyclingMaps, mapCycleNoExit; -DENG_EXTERN_C int netSvAllowCheats; -DENG_EXTERN_C int netSvAllowSendMsg; -DENG_EXTERN_C char *mapCycle; -DENG_EXTERN_C char gameConfigString[]; +DE_EXTERN_C char cyclingMaps, mapCycleNoExit; +DE_EXTERN_C int netSvAllowCheats; +DE_EXTERN_C int netSvAllowSendMsg; +DE_EXTERN_C char *mapCycle; +DE_EXTERN_C char gameConfigString[]; #ifdef __cplusplus extern "C" { diff --git a/doomsday/apps/plugins/common/include/dmu_archiveindex.h b/doomsday/apps/plugins/common/include/dmu_archiveindex.h index 06ccfdb170..b4a13e1282 100644 --- a/doomsday/apps/plugins/common/include/dmu_archiveindex.h +++ b/doomsday/apps/plugins/common/include/dmu_archiveindex.h @@ -94,7 +94,7 @@ class ArchiveIndex for(int i = 0; i < numElements; ++i) { MapElementPtr element = P_ToPtr(ElementType, i); - DENG_ASSERT(DMU_GetType(element) == ElementType); + DE_ASSERT(DMU_GetType(element) == ElementType); int index = P_GetIntp(element, DMU_ARCHIVE_INDEX); // Not indexed? @@ -113,7 +113,7 @@ class ArchiveIndex // Not indexed? if(index < 0) return; - DENG_ASSERT(indexInLutRange(index)); + DE_ASSERT(indexInLutRange(index)); (*_lut)[index - _indexBase] = element; } diff --git a/doomsday/apps/plugins/common/include/g_common.h b/doomsday/apps/plugins/common/include/g_common.h index 872b62bf1a..5c9e25db9b 100644 --- a/doomsday/apps/plugins/common/include/g_common.h +++ b/doomsday/apps/plugins/common/include/g_common.h @@ -243,6 +243,6 @@ D_CMD( CCmdExitLevel ); } // extern "C" #endif -DENG_EXTERN_C dd_bool singledemo; +DE_EXTERN_C dd_bool singledemo; #endif // LIBCOMMON_GAME_H diff --git a/doomsday/apps/plugins/common/include/gamerules.h b/doomsday/apps/plugins/common/include/gamerules.h index a4b12a477f..984aeb4d35 100644 --- a/doomsday/apps/plugins/common/include/gamerules.h +++ b/doomsday/apps/plugins/common/include/gamerules.h @@ -88,7 +88,7 @@ class GameRules void update(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #define gfw_Rule(name) (gfw_Session()->rules().values.name) diff --git a/doomsday/apps/plugins/common/include/gamesession.h b/doomsday/apps/plugins/common/include/gamesession.h index 7fcb1632cf..99c056402b 100644 --- a/doomsday/apps/plugins/common/include/gamesession.h +++ b/doomsday/apps/plugins/common/include/gamesession.h @@ -231,7 +231,7 @@ class GameSession : public AbstractSession static void consoleRegister(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace common diff --git a/doomsday/apps/plugins/common/include/hu_lib.h b/doomsday/apps/plugins/common/include/hu_lib.h index cef15e1ff8..0345561339 100644 --- a/doomsday/apps/plugins/common/include/hu_lib.h +++ b/doomsday/apps/plugins/common/include/hu_lib.h @@ -114,6 +114,6 @@ struct ui_rendstate_t float pageAlpha; }; -DENG_EXTERN_C ui_rendstate_t const *uiRendState; +DE_EXTERN_C ui_rendstate_t const *uiRendState; #endif // LIBCOMMON_UI_LIBRARY_H diff --git a/doomsday/apps/plugins/common/include/hu_stuff.h b/doomsday/apps/plugins/common/include/hu_stuff.h index 61eea33422..94381f87c9 100644 --- a/doomsday/apps/plugins/common/include/hu_stuff.h +++ b/doomsday/apps/plugins/common/include/hu_stuff.h @@ -32,21 +32,21 @@ #endif #if __JHERETIC__ || __JHEXEN__ -DENG_EXTERN_C patchid_t pInvItemBox; -DENG_EXTERN_C patchid_t pInvSelectBox; -DENG_EXTERN_C patchid_t pInvPageLeft[2]; -DENG_EXTERN_C patchid_t pInvPageRight[2]; +DE_EXTERN_C patchid_t pInvItemBox; +DE_EXTERN_C patchid_t pInvSelectBox; +DE_EXTERN_C patchid_t pInvPageLeft[2]; +DE_EXTERN_C patchid_t pInvPageRight[2]; #endif #if __JDOOM__ || __JDOOM64__ // Quit messages. #define NUM_QUITMESSAGES 22 -DENG_EXTERN_C char const *endmsg[NUM_QUITMESSAGES + 1]; +DE_EXTERN_C char const *endmsg[NUM_QUITMESSAGES + 1]; #endif -DENG_EXTERN_C dd_bool shiftdown; -DENG_EXTERN_C char const shiftXForm[]; -DENG_EXTERN_C patchid_t borderPatches[8]; +DE_EXTERN_C dd_bool shiftdown; +DE_EXTERN_C char const shiftXForm[]; +DE_EXTERN_C patchid_t borderPatches[8]; // The fonts. typedef enum { @@ -68,7 +68,7 @@ typedef enum { NUM_GAME_FONTS } gamefontid_t; -DENG_EXTERN_C fontid_t fonts[NUM_GAME_FONTS]; +DE_EXTERN_C fontid_t fonts[NUM_GAME_FONTS]; #define FID(idx) (fonts[idx]) // Vector graphics. diff --git a/doomsday/apps/plugins/common/include/hud/automapstyle.h b/doomsday/apps/plugins/common/include/hud/automapstyle.h index 779a3aac88..e2eff88992 100644 --- a/doomsday/apps/plugins/common/include/hud/automapstyle.h +++ b/doomsday/apps/plugins/common/include/hud/automapstyle.h @@ -174,8 +174,8 @@ struct automapcfg_lineinfo_t */ class AutomapStyle { - DENG2_NO_ASSIGN(AutomapStyle) - DENG2_NO_COPY(AutomapStyle) + DE_NO_ASSIGN(AutomapStyle) + DE_NO_COPY(AutomapStyle) public: AutomapStyle(); @@ -198,7 +198,7 @@ class AutomapStyle void setObjectSvg(automapcfg_objectname_t name, svgid_t svg); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; void ST_InitAutomapStyle(); diff --git a/doomsday/apps/plugins/common/include/hud/hudwidget.h b/doomsday/apps/plugins/common/include/hud/hudwidget.h index aa71ef238f..1a6fa90134 100644 --- a/doomsday/apps/plugins/common/include/hud/hudwidget.h +++ b/doomsday/apps/plugins/common/include/hud/hudwidget.h @@ -43,7 +43,7 @@ class HudWidget de::dint player = 0, uiwidgetid_t id = 0); virtual ~HudWidget(); - DENG2_CAST_METHODS() + DE_CAST_METHODS() uiwidgetid_t id() const; void setId(uiwidgetid_t newId); @@ -76,7 +76,7 @@ class HudWidget virtual void tick(timespan_t /*elapsed*/) {} private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; typedef void (*UpdateGeometryFunc)(HudWidget *); diff --git a/doomsday/apps/plugins/common/include/hud/widgets/automapwidget.h b/doomsday/apps/plugins/common/include/hud/widgets/automapwidget.h index 4201d8faa3..da9cad27d0 100644 --- a/doomsday/apps/plugins/common/include/hud/widgets/automapwidget.h +++ b/doomsday/apps/plugins/common/include/hud/widgets/automapwidget.h @@ -77,7 +77,7 @@ class AutomapWidget : public HudWidget { public: /// Required/referenced point of interest is missing. @ingroup errors - DENG2_ERROR(MissingPointError); + DE_ERROR(MissingPointError); /** * Models a marked point of interest (POI). @@ -282,7 +282,7 @@ class AutomapWidget : public HudWidget static void consoleRegister(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // LIBCOMMON_UI_AUTOMAPWIDGET_H diff --git a/doomsday/apps/plugins/common/include/hud/widgets/chatwidget.h b/doomsday/apps/plugins/common/include/hud/widgets/chatwidget.h index 7308a24375..cae3ed8937 100644 --- a/doomsday/apps/plugins/common/include/hud/widgets/chatwidget.h +++ b/doomsday/apps/plugins/common/include/hud/widgets/chatwidget.h @@ -42,7 +42,7 @@ class ChatWidget : public HudWidget { public: /// An invalid/unknown destination was referenced. @ingroup errors - DENG2_ERROR(DestinationError); + DE_ERROR(DestinationError); public: ChatWidget(de::dint player); @@ -146,7 +146,7 @@ class ChatWidget : public HudWidget static void consoleRegister(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // LIBCOMMON_UI_CHATWIDGET_H diff --git a/doomsday/apps/plugins/common/include/hud/widgets/groupwidget.h b/doomsday/apps/plugins/common/include/hud/widgets/groupwidget.h index 6ed94ecc98..9edb765516 100644 --- a/doomsday/apps/plugins/common/include/hud/widgets/groupwidget.h +++ b/doomsday/apps/plugins/common/include/hud/widgets/groupwidget.h @@ -76,7 +76,7 @@ class GroupWidget : public HudWidget void clearAllChildren(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // LIBCOMMON_UI_GROUPWIDGET_H diff --git a/doomsday/apps/plugins/common/include/hud/widgets/keyslotwidget.h b/doomsday/apps/plugins/common/include/hud/widgets/keyslotwidget.h index af62f77ee8..66d719834f 100644 --- a/doomsday/apps/plugins/common/include/hud/widgets/keyslotwidget.h +++ b/doomsday/apps/plugins/common/include/hud/widgets/keyslotwidget.h @@ -44,7 +44,7 @@ class guidata_keyslot_t : public HudWidget static void prepareAssets(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // LIBCOMMON_UI_KEYSLOTWIDGET_H diff --git a/doomsday/apps/plugins/common/include/hud/widgets/playerlogwidget.h b/doomsday/apps/plugins/common/include/hud/widgets/playerlogwidget.h index 229269d524..6797f3b1bb 100644 --- a/doomsday/apps/plugins/common/include/hud/widgets/playerlogwidget.h +++ b/doomsday/apps/plugins/common/include/hud/widgets/playerlogwidget.h @@ -92,7 +92,7 @@ class PlayerLogWidget : public HudWidget static void consoleRegister(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // LIBCOMMON_UI_PLAYERLOGWIDGET_H diff --git a/doomsday/apps/plugins/common/include/mapstatereader.h b/doomsday/apps/plugins/common/include/mapstatereader.h index c3263e7bc5..2c90ec31f7 100644 --- a/doomsday/apps/plugins/common/include/mapstatereader.h +++ b/doomsday/apps/plugins/common/include/mapstatereader.h @@ -89,7 +89,7 @@ class MapStateReader : public GameStateFolder::MapStateReader void addMobjToThingArchive(struct mobj_s *mobj, ThingArchive::SerialId); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // LIBCOMMON_MAPSTATEREADER_H diff --git a/doomsday/apps/plugins/common/include/mapstatewriter.h b/doomsday/apps/plugins/common/include/mapstatewriter.h index b26b51a201..d3c4c8d6bf 100644 --- a/doomsday/apps/plugins/common/include/mapstatewriter.h +++ b/doomsday/apps/plugins/common/include/mapstatewriter.h @@ -79,7 +79,7 @@ class MapStateWriter //de::Id thinkerIdFromMappedNumber(int mappedNumber) const override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // LIBCOMMON_MAPSTATEWRITER_H diff --git a/doomsday/apps/plugins/common/include/menu/page.h b/doomsday/apps/plugins/common/include/menu/page.h index aed7aa7dab..89b255a815 100644 --- a/doomsday/apps/plugins/common/include/menu/page.h +++ b/doomsday/apps/plugins/common/include/menu/page.h @@ -122,7 +122,7 @@ class Page */ template inline WidgetType &addWidget(WidgetType *widget) { - DENG2_ASSERT(widget != 0); + DE_ASSERT(widget != 0); addWidget(static_cast(widget)); return *widget; } @@ -225,7 +225,7 @@ class Page QVariant const &userValue() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; Q_DECLARE_OPERATORS_FOR_FLAGS(Page::Flags) diff --git a/doomsday/apps/plugins/common/include/menu/widgets/buttonwidget.h b/doomsday/apps/plugins/common/include/menu/widgets/buttonwidget.h index 98f6b1a9a2..3d2e5a1a0a 100644 --- a/doomsday/apps/plugins/common/include/menu/widgets/buttonwidget.h +++ b/doomsday/apps/plugins/common/include/menu/widgets/buttonwidget.h @@ -51,7 +51,7 @@ class ButtonWidget : public Widget bool noAltText() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace menu diff --git a/doomsday/apps/plugins/common/include/menu/widgets/coloreditwidget.h b/doomsday/apps/plugins/common/include/menu/widgets/coloreditwidget.h index f66a395605..1d5c8e952b 100644 --- a/doomsday/apps/plugins/common/include/menu/widgets/coloreditwidget.h +++ b/doomsday/apps/plugins/common/include/menu/widgets/coloreditwidget.h @@ -98,7 +98,7 @@ class ColorEditWidget : public Widget ColorEditWidget &setAlpha(float newAlpha, int flags = MNCOLORBOX_SCF_NO_ACTION); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace menu diff --git a/doomsday/apps/plugins/common/include/menu/widgets/cvartextualsliderwidget.h b/doomsday/apps/plugins/common/include/menu/widgets/cvartextualsliderwidget.h index a69fd6e651..db61d3569f 100644 --- a/doomsday/apps/plugins/common/include/menu/widgets/cvartextualsliderwidget.h +++ b/doomsday/apps/plugins/common/include/menu/widgets/cvartextualsliderwidget.h @@ -52,7 +52,7 @@ class CVarTextualSliderWidget : public CVarSliderWidget de::String nthSuffix() const; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace menu diff --git a/doomsday/apps/plugins/common/include/menu/widgets/cvartogglewidget.h b/doomsday/apps/plugins/common/include/menu/widgets/cvartogglewidget.h index cb77ea3068..bc2db59808 100644 --- a/doomsday/apps/plugins/common/include/menu/widgets/cvartogglewidget.h +++ b/doomsday/apps/plugins/common/include/menu/widgets/cvartogglewidget.h @@ -66,7 +66,7 @@ class CVarToggleWidget : public ButtonWidget void pageActivated() override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; void CVarToggleWidget_UpdateCVar(Widget &wi, Widget::Action action); diff --git a/doomsday/apps/plugins/common/include/menu/widgets/labelwidget.h b/doomsday/apps/plugins/common/include/menu/widgets/labelwidget.h index 4757982c29..a7860fbe12 100644 --- a/doomsday/apps/plugins/common/include/menu/widgets/labelwidget.h +++ b/doomsday/apps/plugins/common/include/menu/widgets/labelwidget.h @@ -52,7 +52,7 @@ class LabelWidget : public Widget LabelWidget &setText(de::String const &newText); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace menu diff --git a/doomsday/apps/plugins/common/include/menu/widgets/lineeditwidget.h b/doomsday/apps/plugins/common/include/menu/widgets/lineeditwidget.h index 2e65505753..88de1308b1 100644 --- a/doomsday/apps/plugins/common/include/menu/widgets/lineeditwidget.h +++ b/doomsday/apps/plugins/common/include/menu/widgets/lineeditwidget.h @@ -93,7 +93,7 @@ class LineEditWidget : public Widget static void loadResources(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace menu diff --git a/doomsday/apps/plugins/common/include/menu/widgets/listwidget.h b/doomsday/apps/plugins/common/include/menu/widgets/listwidget.h index da5e26d2a4..6a9dc55dfd 100644 --- a/doomsday/apps/plugins/common/include/menu/widgets/listwidget.h +++ b/doomsday/apps/plugins/common/include/menu/widgets/listwidget.h @@ -126,7 +126,7 @@ class ListWidget : public Widget void pageActivated() override; private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; typedef ListWidget::Item ListWidgetItem; diff --git a/doomsday/apps/plugins/common/include/menu/widgets/mobjpreviewwidget.h b/doomsday/apps/plugins/common/include/menu/widgets/mobjpreviewwidget.h index 3fc52e8f82..33d47e67e7 100644 --- a/doomsday/apps/plugins/common/include/menu/widgets/mobjpreviewwidget.h +++ b/doomsday/apps/plugins/common/include/menu/widgets/mobjpreviewwidget.h @@ -49,7 +49,7 @@ class MobjPreviewWidget : public Widget void setTranslationMap(int tMap); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace menu diff --git a/doomsday/apps/plugins/common/include/menu/widgets/rectwidget.h b/doomsday/apps/plugins/common/include/menu/widgets/rectwidget.h index a550e8ab7e..35070fe218 100644 --- a/doomsday/apps/plugins/common/include/menu/widgets/rectwidget.h +++ b/doomsday/apps/plugins/common/include/menu/widgets/rectwidget.h @@ -49,7 +49,7 @@ class RectWidget : public Widget void setBackgroundPatch(patchid_t newBackgroundPatch); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace menu diff --git a/doomsday/apps/plugins/common/include/menu/widgets/sliderwidget.h b/doomsday/apps/plugins/common/include/menu/widgets/sliderwidget.h index d1e3f4602b..bcb9e3b970 100644 --- a/doomsday/apps/plugins/common/include/menu/widgets/sliderwidget.h +++ b/doomsday/apps/plugins/common/include/menu/widgets/sliderwidget.h @@ -86,7 +86,7 @@ class SliderWidget : public Widget static void loadResources(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; } // namespace menu diff --git a/doomsday/apps/plugins/common/include/menu/widgets/widget.h b/doomsday/apps/plugins/common/include/menu/widgets/widget.h index 50e370ce60..b856c865c7 100644 --- a/doomsday/apps/plugins/common/include/menu/widgets/widget.h +++ b/doomsday/apps/plugins/common/include/menu/widgets/widget.h @@ -43,7 +43,7 @@ class Widget { public: /// Required Page is presently missing. @ingroup errors - DENG2_ERROR(MissingPageError); + DE_ERROR(MissingPageError); enum Flag { @@ -98,7 +98,7 @@ class Widget Widget(); virtual ~Widget(); - DENG2_CAST_METHODS() + DE_CAST_METHODS() virtual void draw() const {} @@ -240,7 +240,7 @@ class Widget static de::String labelText(const de::String &text, const de::String &context = "Menu Label"); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; Q_DECLARE_OPERATORS_FOR_FLAGS(Widget::Flags) diff --git a/doomsday/apps/plugins/common/include/p_inventory.h b/doomsday/apps/plugins/common/include/p_inventory.h index 6bc81ec0b5..4bd242a08c 100644 --- a/doomsday/apps/plugins/common/include/p_inventory.h +++ b/doomsday/apps/plugins/common/include/p_inventory.h @@ -47,7 +47,7 @@ typedef struct { patchid_t patchId; } invitem_t; -DENG_EXTERN_C int didUseItem; +DE_EXTERN_C int didUseItem; #ifdef __cplusplus extern "C" { diff --git a/doomsday/apps/plugins/common/include/p_map.h b/doomsday/apps/plugins/common/include/p_map.h index 7238bbc2e5..65e03a1312 100644 --- a/doomsday/apps/plugins/common/include/p_map.h +++ b/doomsday/apps/plugins/common/include/p_map.h @@ -24,20 +24,20 @@ #include "common.h" -DENG_EXTERN_C dd_bool tmFloatOk; ///< @c true= move would be ok if within "tmFloorZ - tmCeilingZ". -DENG_EXTERN_C coord_t tmFloorZ; -DENG_EXTERN_C coord_t tmCeilingZ; -DENG_EXTERN_C dd_bool tmFellDown; -DENG_EXTERN_C Line *tmCeilingLine; -DENG_EXTERN_C Line *tmFloorLine; -DENG_EXTERN_C Line *tmBlockingLine; +DE_EXTERN_C dd_bool tmFloatOk; ///< @c true= move would be ok if within "tmFloorZ - tmCeilingZ". +DE_EXTERN_C coord_t tmFloorZ; +DE_EXTERN_C coord_t tmCeilingZ; +DE_EXTERN_C dd_bool tmFellDown; +DE_EXTERN_C Line *tmCeilingLine; +DE_EXTERN_C Line *tmFloorLine; +DE_EXTERN_C Line *tmBlockingLine; #if __JHEXEN__ -DENG_EXTERN_C mobj_t *tmBlockingMobj; +DE_EXTERN_C mobj_t *tmBlockingMobj; #endif -DENG_EXTERN_C mobj_t *lineTarget; // Who got hit (or NULL). +DE_EXTERN_C mobj_t *lineTarget; // Who got hit (or NULL). #if __JHEXEN__ -DENG_EXTERN_C mobj_t *PuffSpawned; +DE_EXTERN_C mobj_t *PuffSpawned; #endif #ifdef __cplusplus diff --git a/doomsday/apps/plugins/common/include/p_mapsetup.h b/doomsday/apps/plugins/common/include/p_mapsetup.h index bdd93609c4..8d1790849f 100644 --- a/doomsday/apps/plugins/common/include/p_mapsetup.h +++ b/doomsday/apps/plugins/common/include/p_mapsetup.h @@ -29,7 +29,7 @@ #include "api_map.h" // If true we are in the process of setting up a map. -DENG_EXTERN_C dd_bool mapSetup; +DE_EXTERN_C dd_bool mapSetup; #ifdef __cplusplus diff --git a/doomsday/apps/plugins/common/include/p_mapspec.h b/doomsday/apps/plugins/common/include/p_mapspec.h index 0fc6abf6de..c149f51f7b 100644 --- a/doomsday/apps/plugins/common/include/p_mapspec.h +++ b/doomsday/apps/plugins/common/include/p_mapspec.h @@ -27,7 +27,7 @@ #include "p_iterlist.h" /// For crossed line specials. -DENG_EXTERN_C iterlist_t *spechit; +DE_EXTERN_C iterlist_t *spechit; #ifdef __cplusplus extern "C" { diff --git a/doomsday/apps/plugins/common/include/p_saveg.h b/doomsday/apps/plugins/common/include/p_saveg.h index 9398645e81..edb25a3574 100644 --- a/doomsday/apps/plugins/common/include/p_saveg.h +++ b/doomsday/apps/plugins/common/include/p_saveg.h @@ -27,7 +27,7 @@ class MapStateWriter; class MapStateReader; -DENG_EXTERN_C int saveToRealPlayerNum[MAXPLAYERS]; +DE_EXTERN_C int saveToRealPlayerNum[MAXPLAYERS]; #if __JHEXEN__ typedef struct targetplraddress_s { @@ -35,7 +35,7 @@ typedef struct targetplraddress_s { struct targetplraddress_s *next; } targetplraddress_t; -DENG_EXTERN_C targetplraddress_t *targetPlayerAddrs; +DE_EXTERN_C targetplraddress_t *targetPlayerAddrs; void SV_InitTargetPlayers(); void SV_ClearTargetPlayers(); diff --git a/doomsday/apps/plugins/common/include/p_start.h b/doomsday/apps/plugins/common/include/p_start.h index 9d83f4cb2f..d96a85b515 100644 --- a/doomsday/apps/plugins/common/include/p_start.h +++ b/doomsday/apps/plugins/common/include/p_start.h @@ -125,14 +125,14 @@ typedef struct { mapspotid_t spot; } playerstart_t; -DENG_EXTERN_C uint numMapSpots; -DENG_EXTERN_C mapspot_t *mapSpots; +DE_EXTERN_C uint numMapSpots; +DE_EXTERN_C mapspot_t *mapSpots; #if __JHERETIC__ -DENG_EXTERN_C mapspotid_t *maceSpots; -DENG_EXTERN_C uint maceSpotCount; -DENG_EXTERN_C mapspotid_t* bossSpots; -DENG_EXTERN_C uint bossSpotCount; +DE_EXTERN_C mapspotid_t *maceSpots; +DE_EXTERN_C uint maceSpotCount; +DE_EXTERN_C mapspotid_t* bossSpots; +DE_EXTERN_C uint bossSpotCount; #endif #ifdef __cplusplus diff --git a/doomsday/apps/plugins/common/include/p_tick.h b/doomsday/apps/plugins/common/include/p_tick.h index b9d3c8e32b..35c240a4f3 100644 --- a/doomsday/apps/plugins/common/include/p_tick.h +++ b/doomsday/apps/plugins/common/include/p_tick.h @@ -24,9 +24,9 @@ #include "dd_types.h" #include "pause.h" -DENG_EXTERN_C int mapTime; -DENG_EXTERN_C int actualMapTime; -DENG_EXTERN_C int timerGame; +DE_EXTERN_C int mapTime; +DE_EXTERN_C int actualMapTime; +DE_EXTERN_C int timerGame; #ifdef __cplusplus extern "C" { diff --git a/doomsday/apps/plugins/common/include/p_user.h b/doomsday/apps/plugins/common/include/p_user.h index 8a6c7ccc1d..4153dd89bf 100644 --- a/doomsday/apps/plugins/common/include/p_user.h +++ b/doomsday/apps/plugins/common/include/p_user.h @@ -27,18 +27,20 @@ #define PLAYER_REBORN_TICS (1 * TICSPERSEC) -DENG_EXTERN_C dd_bool onground; -DENG_EXTERN_C float turboMul; // Multiplier for running speed. -DENG_EXTERN_C int maxHealth; +DE_EXTERN_C dd_bool onground; + +DE_EXTERN_C dd_bool onground; +DE_EXTERN_C float turboMul; // Multiplier for running speed. +DE_EXTERN_C int maxHealth; #if __JDOOM__ || __JDOOM64__ -DENG_EXTERN_C int healthLimit; -DENG_EXTERN_C int godModeHealth; -DENG_EXTERN_C int soulSphereLimit; -DENG_EXTERN_C int megaSphereHealth; -DENG_EXTERN_C int soulSphereHealth; -DENG_EXTERN_C int armorPoints[4]; -DENG_EXTERN_C int armorClass[4]; +DE_EXTERN_C int healthLimit; +DE_EXTERN_C int godModeHealth; +DE_EXTERN_C int soulSphereLimit; +DE_EXTERN_C int megaSphereHealth; +DE_EXTERN_C int soulSphereHealth; +DE_EXTERN_C int armorPoints[4]; +DE_EXTERN_C int armorClass[4]; #endif #ifdef __cplusplus diff --git a/doomsday/apps/plugins/common/include/p_xg.h b/doomsday/apps/plugins/common/include/p_xg.h index 863d67af9f..a0fd4fc722 100644 --- a/doomsday/apps/plugins/common/include/p_xg.h +++ b/doomsday/apps/plugins/common/include/p_xg.h @@ -27,8 +27,8 @@ /// Indicates XG is available. #define LIBCOMMON_HAVE_XG 1 -DENG_EXTERN_C int xgDev; -DENG_EXTERN_C dd_bool xgDataLumps; +DE_EXTERN_C int xgDev; +DE_EXTERN_C dd_bool xgDataLumps; #ifdef __cplusplus diff --git a/doomsday/apps/plugins/common/include/p_xgline.h b/doomsday/apps/plugins/common/include/p_xgline.h index a80e7ee55c..6c6af5ba64 100644 --- a/doomsday/apps/plugins/common/include/p_xgline.h +++ b/doomsday/apps/plugins/common/include/p_xgline.h @@ -361,10 +361,10 @@ typedef struct { } xgline_t; // The XG line Classes -DENG_EXTERN_C struct xgclass_s xgClasses[]; +DE_EXTERN_C struct xgclass_s xgClasses[]; // Used as the activator if there is no real activator. -DENG_EXTERN_C struct mobj_s *XG_DummyThing(); +DE_EXTERN_C struct mobj_s *XG_DummyThing(); #ifdef __cplusplus extern "C" { diff --git a/doomsday/apps/plugins/common/include/pause.h b/doomsday/apps/plugins/common/include/pause.h index 6fb0b59f74..94d18a5d56 100644 --- a/doomsday/apps/plugins/common/include/pause.h +++ b/doomsday/apps/plugins/common/include/pause.h @@ -25,7 +25,7 @@ #include "dd_share.h" /// Non-zero when the game is paused: game time is not advancing. -DENG_EXTERN_C int paused; +DE_EXTERN_C int paused; #ifdef __cplusplus extern "C" { diff --git a/doomsday/apps/plugins/common/include/r_common.h b/doomsday/apps/plugins/common/include/r_common.h index 25486d7576..3b82d93aad 100644 --- a/doomsday/apps/plugins/common/include/r_common.h +++ b/doomsday/apps/plugins/common/include/r_common.h @@ -43,8 +43,8 @@ /// Globally visible view scale factors which translate between the dimensions /// of viewports and the legacy 320x200 fixed coordinate space. -DENG_EXTERN_C Size2Rawf viewScale; -DENG_EXTERN_C float aspectScale; +DE_EXTERN_C Size2Rawf viewScale; +DE_EXTERN_C float aspectScale; #ifdef __cplusplus extern "C" { diff --git a/doomsday/apps/plugins/common/include/saveslots.h b/doomsday/apps/plugins/common/include/saveslots.h index 825b200da2..177d1845dc 100644 --- a/doomsday/apps/plugins/common/include/saveslots.h +++ b/doomsday/apps/plugins/common/include/saveslots.h @@ -34,7 +34,7 @@ class SaveSlots { public: /// A missing/unknown slot was referenced. @ingroup errors - DENG2_ERROR(MissingSlotError); + DE_ERROR(MissingSlotError); /** * Logical save slot. @@ -100,7 +100,7 @@ class SaveSlots friend class SaveSlots; void setGameStateFolder(GameStateFolder *newSession); - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; public: @@ -189,7 +189,7 @@ class SaveSlots static void consoleRegister(); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; typedef SaveSlots::Slot SaveSlot; diff --git a/doomsday/apps/plugins/common/include/thingarchive.h b/doomsday/apps/plugins/common/include/thingarchive.h index 6bf3176ebb..f7a41dd5a5 100644 --- a/doomsday/apps/plugins/common/include/thingarchive.h +++ b/doomsday/apps/plugins/common/include/thingarchive.h @@ -75,7 +75,7 @@ class ThingArchive struct mobj_s *mobj(SerialId serialId, void *address); private: - DENG2_PRIVATE(d) + DE_PRIVATE(d) }; #endif // LIBCOMMON_P_ACTOR_H diff --git a/doomsday/apps/plugins/common/src/acs/interpreter.cpp b/doomsday/apps/plugins/common/src/acs/interpreter.cpp index 3f77efa8dc..0c8a042f96 100644 --- a/doomsday/apps/plugins/common/src/acs/interpreter.cpp +++ b/doomsday/apps/plugins/common/src/acs/interpreter.cpp @@ -56,13 +56,13 @@ namespace internal ACS_COMMAND(NOP) { - DENG2_UNUSED(interp); + DE_UNUSED(interp); return Continue; } ACS_COMMAND(Terminate) { - DENG2_UNUSED(interp); + DE_UNUSED(interp); return Terminate; } @@ -748,7 +748,7 @@ namespace internal ACS_COMMAND(BeginPrint) { - DENG2_UNUSED(interp); + DE_UNUSED(interp); printBuffer.clear(); return Continue; } @@ -776,7 +776,7 @@ namespace internal ACS_COMMAND(EndPrintBold) { - DENG2_UNUSED(interp); + DE_UNUSED(interp); for(int i = 0; i < MAXPLAYERS; ++i) { if(players[i].plr->inGame) @@ -1136,7 +1136,7 @@ System &Interpreter::scriptSys() const Script &Interpreter::script() const { - DENG2_ASSERT(_script); + DE_ASSERT(_script); return *_script; } @@ -1219,7 +1219,7 @@ int Interpreter::read(MapStateReader *msr) if(lineIndex >= 0) { line = (Line *) P_ToPtr(DMU_LINE, lineIndex); - DENG2_ASSERT(line); + DE_ASSERT(line); } else { @@ -1269,7 +1269,7 @@ int Interpreter::read(MapStateReader *msr) if(temp >= 0) { line = (Line *) P_ToPtr(DMU_LINE, temp); - DENG2_ASSERT(line); + DE_ASSERT(line); } else { @@ -1304,6 +1304,6 @@ int Interpreter::read(MapStateReader *msr) void acs_Interpreter_Think(acs_Interpreter *interp) { - DENG2_ASSERT(interp); + DE_ASSERT(interp); reinterpret_cast(interp)->think(); } diff --git a/doomsday/apps/plugins/common/src/acs/module.cpp b/doomsday/apps/plugins/common/src/acs/module.cpp index b002f194e8..0b42fcd9d3 100644 --- a/doomsday/apps/plugins/common/src/acs/module.cpp +++ b/doomsday/apps/plugins/common/src/acs/module.cpp @@ -33,7 +33,7 @@ using namespace de; namespace acs { -DENG2_PIMPL_NOREF(Module) +DE_PIMPL_NOREF(Module) { Block pcode; QVector entryPoints; @@ -69,7 +69,7 @@ bool Module::recognize(File1 const &file) // static Module *Module::newFromBytecode(Block const &bytecode) // static { - DENG2_ASSERT(!IS_CLIENT); + DE_ASSERT(!IS_CLIENT); LOG_AS("acs::Module"); std::unique_ptr module(new Module); @@ -145,7 +145,7 @@ Module *Module::newFromBytecode(Block const &bytecode) // static Module *Module::newFromFile(File1 const &file) // static { - DENG2_ASSERT(!IS_CLIENT); + DE_ASSERT(!IS_CLIENT); LOG_AS("acs::Module"); LOG_SCR_VERBOSE("Loading from %s:%s...") << NativePath(file.container().composePath()).pretty() diff --git a/doomsday/apps/plugins/common/src/acs/script.cpp b/doomsday/apps/plugins/common/src/acs/script.cpp index bb1b6b8a96..61139ae3e8 100644 --- a/doomsday/apps/plugins/common/src/acs/script.cpp +++ b/doomsday/apps/plugins/common/src/acs/script.cpp @@ -42,7 +42,7 @@ Script::Args::Args(dbyte const *cArr, dint length) // ---------------------------------------------------------------------------- -DENG2_PIMPL_NOREF(Script) +DE_PIMPL_NOREF(Script) { Module::EntryPoint const *entryPoint = nullptr; State state = Inactive; @@ -50,7 +50,7 @@ DENG2_PIMPL_NOREF(Script) void wait(State waitState, int value) { - DENG2_ASSERT((waitState == WaitingForSector) || + DE_ASSERT((waitState == WaitingForSector) || (waitState == WaitingForPolyobj) || (waitState == WaitingForScript)); @@ -80,7 +80,7 @@ String Script::describe() const Module::EntryPoint const &ep = entryPoint(); return "ACScript #" DE2_ESC(b) + String::number(ep.scriptNumber) + DE2_ESC(l) " Args: " DE2_ESC(.) DE2_ESC(i) + String::number(ep.scriptArgCount) - + DE2_ESC(l) " Open: " DE2_ESC(.) DE2_ESC(i) + DENG2_BOOL_YESNO(ep.startWhenMapBegins); + + DE2_ESC(l) " Open: " DE2_ESC(.) DE2_ESC(i) + DE_BOOL_YESNO(ep.startWhenMapBegins); } String Script::description() const @@ -190,7 +190,7 @@ void Script::sectorFinished(int tag) Module::EntryPoint const &Script::entryPoint() const { - DENG2_ASSERT(d->entryPoint); + DE_ASSERT(d->entryPoint); return *d->entryPoint; } @@ -201,14 +201,14 @@ void Script::setEntryPoint(Module::EntryPoint const &entryPoint) void Script::write(writer_s *writer) const { - DENG2_ASSERT(writer); + DE_ASSERT(writer); Writer_WriteInt16(writer, d->state); Writer_WriteInt16(writer, d->waitValue); } void Script::read(reader_s *reader) { - DENG2_ASSERT(reader); + DE_ASSERT(reader); d->state = State( Reader_ReadInt16(reader) ); d->waitValue = Reader_ReadInt16(reader); } diff --git a/doomsday/apps/plugins/common/src/acs/system.cpp b/doomsday/apps/plugins/common/src/acs/system.cpp index 362ca99751..b29e4858d5 100644 --- a/doomsday/apps/plugins/common/src/acs/system.cpp +++ b/doomsday/apps/plugins/common/src/acs/system.cpp @@ -32,7 +32,7 @@ using namespace de; namespace acs { -DENG2_PIMPL_NOREF(System) +DE_PIMPL_NOREF(System) { std::unique_ptr currentModule; QList