From 527b1fbfd52511179da0bdfe1586d636b67a4315 Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Tue, 19 Nov 2019 21:33:59 +0100 Subject: [PATCH] Applied new AStyle settings --- neo/idlib/containers/StaticList.h | 2 +- neo/renderer/DXT/DXTEncoder.cpp | 2 +- neo/sys/common/localuser.h | 12 ++++++------ neo/sys/sys_profile.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/neo/idlib/containers/StaticList.h b/neo/idlib/containers/StaticList.h index da4060ba..8e615599 100644 --- a/neo/idlib/containers/StaticList.h +++ b/neo/idlib/containers/StaticList.h @@ -601,7 +601,7 @@ ID_INLINE bool idStaticList::RemoveIndex( int index ) num--; for( i = index; i < num; i++ ) { - list[ i ] = std::move(list[ i + 1 ]); + list[ i ] = std::move( list[ i + 1 ] ); } return true; diff --git a/neo/renderer/DXT/DXTEncoder.cpp b/neo/renderer/DXT/DXTEncoder.cpp index 7c57214e..f7fc7395 100644 --- a/neo/renderer/DXT/DXTEncoder.cpp +++ b/neo/renderer/DXT/DXTEncoder.cpp @@ -47,7 +47,7 @@ typedef uint32 dword; // macros required by gimp-dds code: #ifndef MIN #ifdef __GNUC__ -# define MIN(a, b) ({decltype(a) _a=(a); decltype(b) _b=(b); _a < _b ? _a : _b;}) + #define MIN(a, b) ({decltype(a) _a=(a); decltype(b) _b=(b); _a < _b ? _a : _b;}) #else #define MIN(a, b) ((a) < (b) ? (a) : (b)) #endif diff --git a/neo/sys/common/localuser.h b/neo/sys/common/localuser.h index f57cce4c..7d2e042e 100644 --- a/neo/sys/common/localuser.h +++ b/neo/sys/common/localuser.h @@ -47,12 +47,12 @@ public: idLocalUserWin() : inputDevice( 0 ) {} - idLocalUserWin& operator=(idLocalUserWin&& other) - { - gamertag = std::move(other.gamertag); - inputDevice = other.inputDevice; - return *this; - } + idLocalUserWin& operator=( idLocalUserWin&& other ) + { + gamertag = std::move( other.gamertag ); + inputDevice = other.inputDevice; + return *this; + } //========================================================================================== // idLocalUser interface diff --git a/neo/sys/sys_profile.h b/neo/sys/sys_profile.h index 86738a77..4533ecff 100644 --- a/neo/sys/sys_profile.h +++ b/neo/sys/sys_profile.h @@ -48,8 +48,8 @@ public: idProfileMgr(); ~idProfileMgr(); - // Not copyable because we use unique_ptrs. - idProfileMgr& operator=(const idProfileMgr&) = delete; + // Not copyable because we use unique_ptrs. + idProfileMgr& operator=( const idProfileMgr& ) = delete; // Called the first time it's asked to load void Init( idLocalUser* user );