Skip to content

Commit

Permalink
Cleanup: Big renaming of prefixes
Browse files Browse the repository at this point in the history
Renamed libcore's LIBDENG2 => LIBCORE.

All DENG and DENG2 prefixed variables and definitions are now simply
DE prefixed.
  • Loading branch information
skyjake committed Sep 1, 2019
1 parent 75c919b commit cd7b597
Show file tree
Hide file tree
Showing 1,854 changed files with 11,686 additions and 11,654 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -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
2 changes: 1 addition & 1 deletion appveyor.yml
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doomsday/CMakeLists.txt
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions doomsday/apps/CMakeLists.txt
Expand Up @@ -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 ()
6 changes: 3 additions & 3 deletions doomsday/apps/api/api_audiod.h
Expand Up @@ -20,8 +20,8 @@
* 02110-1301 USA</small>
*/

#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
Expand Down Expand Up @@ -74,4 +74,4 @@ typedef struct audiointerface_base_s {

///@}

#endif /* LIBDENG_AUDIO_DRIVER_INTERFACE_H */
#endif /* DE_AUDIO_DRIVER_INTERFACE_H */
8 changes: 4 additions & 4 deletions doomsday/apps/api/api_base.h
Expand Up @@ -43,7 +43,7 @@ typedef struct gameinfo_s {
/// @}

// The Base API.
DENG_API_TYPEDEF(Base)
DE_API_TYPEDEF(Base)
{
de_api_t api;

Expand Down Expand Up @@ -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
Expand All @@ -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
8 changes: 4 additions & 4 deletions doomsday/apps/api/api_busy.h
Expand Up @@ -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 */
8 changes: 4 additions & 4 deletions doomsday/apps/api/api_client.h
Expand Up @@ -5,7 +5,7 @@

struct mobj_s;

DENG_API_TYPEDEF(Client)
DE_API_TYPEDEF(Client)
{
de_api_t api;

Expand Down Expand Up @@ -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
Expand All @@ -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
8 changes: 4 additions & 4 deletions doomsday/apps/api/api_console.h
Expand Up @@ -27,7 +27,7 @@
/// @addtogroup console
///@{

DENG_API_TYPEDEF(Con)
DE_API_TYPEDEF(Con)
{
de_api_t api;

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -111,7 +111,7 @@ DENG_API_T(Con);
#endif

#ifdef __DOOMSDAY__
DENG_USING_API(Con);
DE_USING_API(Con);
#endif

///@}
Expand Down
8 changes: 4 additions & 4 deletions doomsday/apps/api/api_def.h
Expand Up @@ -27,24 +27,24 @@
/// @addtogroup defs
///@{

DENG_API_TYPEDEF(Def) // v2
DE_API_TYPEDEF(Def) // v2
{
de_api_t api;

int (*_Get)(int type, char const *id, void *out);
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

///@}
Expand Down
8 changes: 4 additions & 4 deletions doomsday/apps/api/api_event.h
Expand Up @@ -70,7 +70,7 @@ typedef struct event_s {
/// @addtogroup bindings
///@{

DENG_API_TYPEDEF(B)
DE_API_TYPEDEF(B)
{
de_api_t api;

Expand Down Expand Up @@ -110,17 +110,17 @@ 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
#define DD_GetKeyCode _api_B.GetKeyCode
#endif

#ifdef __DOOMSDAY__
DENG_USING_API(B);
DE_USING_API(B);
#endif

///@}
Expand Down
8 changes: 4 additions & 4 deletions doomsday/apps/api/api_filesys.h
Expand Up @@ -25,7 +25,7 @@
#include <de/str.h>
#include "api_base.h"

DENG_API_TYPEDEF(F)
DE_API_TYPEDEF(F)
{
de_api_t api;

Expand Down Expand Up @@ -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
Expand All @@ -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
14 changes: 7 additions & 7 deletions doomsday/apps/api/api_fontrender.h
Expand Up @@ -20,8 +20,8 @@
* 02110-1301 USA</small>
*/

#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"

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 */
8 changes: 4 additions & 4 deletions doomsday/apps/api/api_gl.h
Expand Up @@ -252,7 +252,7 @@ typedef struct {
float scaleFactor;
} dgl_borderedprojectionstate_t;

DENG_API_TYPEDEF(GL)
DE_API_TYPEDEF(GL)
{
de_api_t api;

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -455,7 +455,7 @@ DENG_API_T(GL);
#endif

#if defined __DOOMSDAY__ && defined __CLIENT__
DENG_USING_API(GL);
DE_USING_API(GL);
#endif

///@}
Expand Down
8 changes: 4 additions & 4 deletions doomsday/apps/api/api_infine.h
Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand All @@ -138,7 +138,7 @@ DENG_API_T(Infine);
#endif

#ifdef __DOOMSDAY__
DENG_USING_API(Infine);
DE_USING_API(Infine);
#endif

///@}
Expand Down
6 changes: 3 additions & 3 deletions doomsday/apps/api/api_internaldata.h
Expand Up @@ -29,7 +29,7 @@
*
* @deprecated Avoid this API.
*/
DENG_API_TYPEDEF(InternalData)
DE_API_TYPEDEF(InternalData)
{
de_api_t api;

Expand All @@ -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

0 comments on commit cd7b597

Please sign in to comment.