mirror of
https://github.com/transmission/transmission
synced 2024-12-23 16:24:02 +00:00
Merge branch 'master' into patch-1
This commit is contained in:
Mitch Livingston
GitHub
commit
2decfff353
2 changed files with 45 additions and 6 deletions
|
|
@ -49,7 +49,7 @@ public:
|
|||
static QColor getFadedColor(QColor const& color);
|
||||
|
||||
template<typename DialogT, typename... ArgsT>
|
||||
static void openDialog(QPointer<DialogT>& dialog, ArgsT&& ... args)
|
||||
static void openDialog(QPointer<DialogT>& dialog, ArgsT&&... args)
|
||||
{
|
||||
if (dialog.isNull())
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Uncrustify-0.69.0_f
|
||||
# Uncrustify-0.70.1_f
|
||||
newlines = auto
|
||||
input_tab_size = 8
|
||||
output_tab_size = 8
|
||||
|
|
@ -12,11 +12,17 @@ enable_digraphs = false
|
|||
utf8_bom = ignore
|
||||
utf8_byte = false
|
||||
utf8_force = false
|
||||
sp_do_brace_open = ignore
|
||||
sp_brace_close_while = ignore
|
||||
sp_while_paren_open = ignore
|
||||
sp_arith = force
|
||||
sp_arith_additive = force
|
||||
sp_assign = force
|
||||
sp_cpp_lambda_assign = remove
|
||||
sp_cpp_lambda_paren = remove
|
||||
sp_cpp_lambda_square_paren = remove
|
||||
sp_cpp_lambda_square_brace = ignore
|
||||
sp_cpp_lambda_paren_brace = ignore
|
||||
sp_cpp_lambda_fparen = ignore
|
||||
sp_assign_default = force
|
||||
sp_before_assign = ignore
|
||||
sp_after_assign = ignore
|
||||
|
|
@ -80,6 +86,8 @@ sp_after_semi = force
|
|||
sp_after_semi_for = force
|
||||
sp_after_semi_for_empty = remove
|
||||
sp_before_square = remove
|
||||
sp_before_vardef_square = remove
|
||||
sp_before_square_asm_block = ignore
|
||||
sp_before_squares = remove
|
||||
sp_cpp_before_struct_binding = ignore
|
||||
sp_inside_square = remove
|
||||
|
|
@ -120,10 +128,12 @@ sp_before_type_brace_init_lst_close = force
|
|||
sp_inside_type_brace_init_lst = force
|
||||
sp_inside_braces = force
|
||||
sp_inside_braces_empty = remove
|
||||
sp_trailing_return = ignore
|
||||
sp_type_func = force
|
||||
sp_type_brace_init_lst = remove
|
||||
sp_func_proto_paren = remove
|
||||
sp_func_proto_paren_empty = remove
|
||||
sp_func_type_paren = ignore
|
||||
sp_func_def_paren = remove
|
||||
sp_func_def_paren_empty = remove
|
||||
sp_inside_fparens = remove
|
||||
|
|
@ -262,6 +272,7 @@ indent_shift = true
|
|||
indent_func_def_force_col1 = false
|
||||
indent_func_call_param = true
|
||||
indent_func_def_param = true
|
||||
indent_func_def_param_paren_pos_threshold = 0
|
||||
indent_func_proto_param = true
|
||||
indent_func_class_param = true
|
||||
indent_func_ctor_var_param = true
|
||||
|
|
@ -269,11 +280,13 @@ indent_template_param = true
|
|||
indent_func_param_double = false
|
||||
indent_func_const = 0
|
||||
indent_func_throw = 0
|
||||
indent_macro_brace = true
|
||||
indent_member = 4
|
||||
indent_member_single = true
|
||||
indent_sing_line_comments = 0
|
||||
indent_relative_single_line_comments = false
|
||||
indent_switch_case = 0
|
||||
indent_switch_break_with_case = false
|
||||
indent_switch_pp = true
|
||||
indent_case_shift = 0
|
||||
indent_case_brace = 4
|
||||
|
|
@ -328,6 +341,9 @@ nl_for_leave_one_liners = false
|
|||
nl_oc_msg_leave_one_liner = false
|
||||
nl_oc_mdef_brace = ignore
|
||||
nl_oc_block_brace = ignore
|
||||
nl_oc_before_interface = ignore
|
||||
nl_oc_before_implementation = ignore
|
||||
nl_oc_before_end = ignore
|
||||
nl_oc_interface_brace = ignore
|
||||
nl_oc_implementation_brace = ignore
|
||||
nl_start_of_file = remove
|
||||
|
|
@ -374,6 +390,8 @@ nl_brace_while = force
|
|||
nl_switch_brace = force
|
||||
nl_synchronized_brace = ignore
|
||||
nl_multi_line_cond = false
|
||||
nl_multi_line_sparen_open = ignore
|
||||
nl_multi_line_sparen_close = ignore
|
||||
nl_multi_line_define = false
|
||||
nl_before_case = true
|
||||
nl_after_case = true
|
||||
|
|
@ -381,6 +399,17 @@ nl_case_colon_brace = ignore
|
|||
nl_before_throw = ignore
|
||||
nl_namespace_brace = force
|
||||
nl_template_class = force
|
||||
nl_template_class_decl = ignore
|
||||
nl_template_class_decl_special = ignore
|
||||
nl_template_class_def = ignore
|
||||
nl_template_class_def_special = ignore
|
||||
nl_template_func = ignore
|
||||
nl_template_func_decl = ignore
|
||||
nl_template_func_decl_special = ignore
|
||||
nl_template_func_def = ignore
|
||||
nl_template_func_def_special = ignore
|
||||
nl_template_var = ignore
|
||||
nl_template_using = ignore
|
||||
nl_class_brace = force
|
||||
nl_class_init_args = ignore
|
||||
nl_constr_init_args = force
|
||||
|
|
@ -419,6 +448,9 @@ nl_func_call_start = ignore
|
|||
nl_func_call_start_multi_line = false
|
||||
nl_func_call_args_multi_line = false
|
||||
nl_func_call_end_multi_line = false
|
||||
nl_template_start = false
|
||||
nl_template_args = false
|
||||
nl_template_end = false
|
||||
nl_oc_msg_args = false
|
||||
nl_fdef_brace = force
|
||||
nl_fdef_brace_cond = ignore
|
||||
|
|
@ -454,6 +486,8 @@ nl_before_do = ignore
|
|||
nl_after_do = force
|
||||
nl_before_return = false
|
||||
nl_after_return = false
|
||||
nl_before_member = ignore
|
||||
nl_after_member = ignore
|
||||
nl_ds_struct_enum_cmt = false
|
||||
nl_ds_struct_enum_close_brace = false
|
||||
nl_class_colon = ignore
|
||||
|
|
@ -463,6 +497,7 @@ nl_create_if_one_liner = false
|
|||
nl_create_for_one_liner = false
|
||||
nl_create_while_one_liner = false
|
||||
nl_create_func_def_one_liner = false
|
||||
nl_create_list_one_liner = false
|
||||
nl_split_if_one_liner = false
|
||||
nl_split_for_one_liner = false
|
||||
nl_split_while_one_liner = false
|
||||
|
|
@ -493,8 +528,11 @@ nl_before_cpp_comment = 0
|
|||
nl_after_multiline_comment = false
|
||||
nl_after_label_colon = false
|
||||
nl_after_struct = 1
|
||||
nl_before_class = 2
|
||||
nl_after_class = 2
|
||||
nl_before_class = 1
|
||||
nl_after_class = 1
|
||||
nl_before_namespace = 0
|
||||
nl_inside_namespace = 2
|
||||
nl_after_namespace = 0
|
||||
nl_before_access_spec = 2
|
||||
nl_after_access_spec = 1
|
||||
nl_comment_func_def = 0
|
||||
|
|
@ -502,7 +540,6 @@ nl_after_try_catch_finally = 2
|
|||
nl_around_cs_property = 0
|
||||
nl_between_get_set = 0
|
||||
nl_property_brace = ignore
|
||||
nl_inside_namespace = 2
|
||||
eat_blanks_after_open_brace = true
|
||||
eat_blanks_before_close_brace = true
|
||||
nl_remove_extra_newlines = 0
|
||||
|
|
@ -632,6 +669,7 @@ mod_add_long_class_closebrace_comment = 0
|
|||
mod_add_long_switch_closebrace_comment = 0
|
||||
mod_add_long_ifdef_endif_comment = 0
|
||||
mod_add_long_ifdef_else_comment = 0
|
||||
mod_sort_case_sensitive = false
|
||||
mod_sort_import = false
|
||||
mod_sort_using = false
|
||||
mod_sort_include = false
|
||||
|
|
@ -668,6 +706,7 @@ include_category_2 = ""
|
|||
use_indent_func_call_param = true
|
||||
use_indent_continue_only_once = true
|
||||
indent_cpp_lambda_only_once = true
|
||||
use_sp_after_angle_always = false
|
||||
use_options_overriding_for_qt_macros = false
|
||||
warn_level_tabs_found_in_verbatim_string_literals = 2
|
||||
type PtrArrayCompareFunc
|
||||
|
|
|
|||
Loading…
Reference in a new issue