minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix clang-format Columns Width 

Also fix l_client.cpp/h and remove them from whitelist
This commit is contained in:
Loic Blot 2017-03-31 22:29:34 +02:00
parent 529ba8002d
commit a4874270f7
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.clang-format
View File

@ -5,6 +5,7 @@ BreakBeforeBraces: Linux
AllowShortIfStatementsOnASingleLine: false AllowShortIfStatementsOnASingleLine: false
IndentCaseLabels: false IndentCaseLabels: false
AccessModifierOffset: -8 AccessModifierOffset: -8
ColumnLimit: 90
IncludeCategories: IncludeCategories:
- Regex: '^".*' - Regex: '^".*'
Priority: 2 Priority: 2

13
src/script/lua_api/l_client.cpp
View File

@ -19,13 +19,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/ */
#include "l_client.h" #include "l_client.h"
#include "l_internal.h" #include "common/c_content.h"
#include "util/string.h" #include "common/c_converter.h"
#include "cpp_api/s_base.h" #include "cpp_api/s_base.h"
#include "gettext.h" #include "gettext.h"
#include "common/c_converter.h" #include "l_internal.h"
#include "common/c_content.h"
#include "lua_api/l_item.h" #include "lua_api/l_item.h"
#include "util/string.h"
int ModApiClient::l_get_current_modname(lua_State *L) int ModApiClient::l_get_current_modname(lua_State *L)
{ {
@ -88,7 +88,7 @@ int ModApiClient::l_get_player_names(lua_State *L)
// show_formspec(formspec) // show_formspec(formspec)
int ModApiClient::l_show_formspec(lua_State *L) int ModApiClient::l_show_formspec(lua_State *L)
{ {
if ( !lua_isstring(L, 1) || !lua_isstring(L, 2) ) if (!lua_isstring(L, 1) || !lua_isstring(L, 2))
return 0; return 0;
ClientEvent event; ClientEvent event;
@ -142,8 +142,7 @@ int ModApiClient::l_get_node_or_nil(lua_State *L)
if (pos_ok) { if (pos_ok) {
// Return node // Return node
pushnode(L, n, getClient(L)->ndef()); pushnode(L, n, getClient(L)->ndef());
} } else {
else {
lua_pushnil(L); lua_pushnil(L);
} }
return 1; return 1;

4
src/script/lua_api/l_client.h
View File

@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "lua_api/l_base.h" #include "lua_api/l_base.h"
class ModApiClient: public ModApiBase class ModApiClient : public ModApiBase
{ {
private: private:
// get_current_modname() // get_current_modname()
@ -31,7 +31,7 @@ private:
// display_chat_message(message) // display_chat_message(message)
static int l_display_chat_message(lua_State *L); static int l_display_chat_message(lua_State *L);
// get_player_names() // get_player_names()
static int l_get_player_names(lua_State *L); static int l_get_player_names(lua_State *L);

2
util/travis/clang-format-whitelist.txt
View File

@ -287,8 +287,6 @@ src/script/lua_api/l_areastore.cpp
src/script/lua_api/l_areastore.h src/script/lua_api/l_areastore.h
src/script/lua_api/l_base.cpp src/script/lua_api/l_base.cpp
src/script/lua_api/l_base.h src/script/lua_api/l_base.h
src/script/lua_api/l_client.cpp
src/script/lua_api/l_client.h
src/script/lua_api/l_craft.cpp src/script/lua_api/l_craft.cpp
src/script/lua_api/l_craft.h src/script/lua_api/l_craft.h
src/script/lua_api/l_env.cpp src/script/lua_api/l_env.cpp