Skip to content

Commit 3ee130d

Browse files
committed
Vala LINT
1 parent 0c42de2 commit 3ee130d

File tree

8 files changed

+49
-15
lines changed

8 files changed

+49
-15
lines changed

src/Common.vala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,11 @@ namespace Pebbles {
210210
}
211211
int n = -1;
212212
for (int i = 0; i < text.length; i++) {
213-
if (text.get_char(i) != '0') {
213+
if (text.get_char (i) != '0') {
214214
n = i;
215215
break;
216216
}
217217
}
218-
return text.substring(n);
218+
return text.substring (n);
219219
}
220220
}

src/components/EntryFormatter.vala

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,13 @@ namespace Pebbles {
120120

121121
Idle.add (() => {
122122
if (main_entry.text_length >= 1 && main_entry.text != "0")
123-
replace_inserted_character (main_entry.text, main_entry.text_length, main_entry.get_position (), ch, polar_mode);
123+
replace_inserted_character (
124+
main_entry.text,
125+
main_entry.text_length,
126+
main_entry.get_position (),
127+
ch,
128+
polar_mode
129+
);
124130
return Source.REMOVE;
125131
});
126132
return Source.REMOVE;
@@ -145,7 +151,13 @@ namespace Pebbles {
145151
});
146152
}
147153

148-
public void replace_inserted_character (string text, uint text_length, int caret_pos, string current_symbol, bool radial_mode = false) {
154+
public void replace_inserted_character (
155+
string text,
156+
uint text_length,
157+
int caret_pos,
158+
string current_symbol,
159+
bool radial_mode = false
160+
) {
149161
var symbols = split_utf8 (text, text_length);
150162
if (current_symbol == null) {
151163
return;
@@ -162,7 +174,8 @@ namespace Pebbles {
162174

163175
bool double_replaced;
164176
int len_gain;
165-
var replacement = find_replacement (current_symbol, previous_symbol, radial_mode, out double_replaced, out len_gain);
177+
var replacement = find_replacement (
178+
current_symbol, previous_symbol, radial_mode, out double_replaced, out len_gain);
166179
symbols[caret_pos] = replacement;
167180
if (double_replaced) {
168181
symbols[previous_caret_pos] = "";

src/shell/MainWindow.vala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ namespace Pebbles {
146146
bool[] arr, GlobalWordLength wrd_length, NumberSystem number_system);
147147
public signal void on_programmer_populate_token_array (string exp, NumberSystem number_system);
148148
public signal string on_programmer_get_last_token ();
149-
public signal string on_programmer_convert_token (string exp, NumberSystem ns_a, NumberSystem ns_b, GlobalWordLength wrd_length, bool format_bin = false);
149+
public signal string on_programmer_convert_token (
150+
string exp, NumberSystem ns_a, NumberSystem ns_b, GlobalWordLength wrd_length, bool format_bin = false);
150151
public signal string on_programmer_str_to_bool_arr (string s, NumberSystem ns, GlobalWordLength wrd_length);
151152
public signal string on_programmer_change_exp_num_sys (string s, NumberSystem ns, GlobalWordLength wrd_length);
152153

src/shell/views/CalculusView.vala

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,13 @@ namespace Pebbles {
7272
protected string constant_label { get; private set; default = "C"; }
7373
protected string constant_desc { get; private set; default = ""; }
7474

75-
public signal void on_evaluate (string input, bool integral_mode, double limit_a, double limit_b, int memory_op = 0);
75+
public signal void on_evaluate (
76+
string input,
77+
bool integral_mode,
78+
double limit_a,
79+
double limit_b,
80+
int memory_op = 0
81+
);
7682
public signal string on_memory_recall (bool global);
7783
public signal void on_memory_clear (bool global);
7884

src/shell/views/GraphingView.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ namespace Pebbles {
372372
}
373373

374374
public override void focus_main () {
375-
375+
376376
}
377377
}
378378
}

src/shell/views/ProgrammerView.vala

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,12 @@ namespace Pebbles {
9292

9393
private Pebbles.Settings settings;
9494

95-
public signal void on_evaluate (string input, NumberSystem number_system, GlobalWordLength wrd_length, int memory_op = 0);
95+
public signal void on_evaluate (
96+
string input,
97+
NumberSystem number_system,
98+
GlobalWordLength wrd_length,
99+
int memory_op = 0
100+
);
96101
public signal string on_memory_recall (bool global);
97102
public signal void on_memory_clear (bool global);
98103

src/shell/views/converters/ConverterView.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ namespace Pebbles {
245245
}
246246

247247
public override void focus_main () {
248-
248+
249249
}
250250
}
251251
}

src/shell/widgets/displays/ProgrammerDisplay.vala

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,12 @@ namespace Pebbles {
8282
);
8383
main_entry.set_position (-1);
8484
entry_formatter.disabled = false;
85-
var answer_text = window.on_programmer_convert_token (main_label.get_text (), _number_system, value, settings.global_word_length);
85+
var answer_text = window.on_programmer_convert_token (
86+
main_label.get_text (),
87+
_number_system,
88+
value,
89+
settings.global_word_length
90+
);
8691
if (value == BINARY) {
8792
answer_text = remove_leading_zeroes (answer_text);
8893
}
@@ -270,10 +275,14 @@ namespace Pebbles {
270275
var token = root_object.get_string_member ("token");
271276

272277
if (root_object.get_string_member ("tokenTypeS") == "operand") {
273-
dec_number_value = window.on_programmer_convert_token (token, current_number_system, NumberSystem.DECIMAL, settings.global_word_length);
274-
hex_number_value = window.on_programmer_convert_token (token, current_number_system, NumberSystem.HEXADECIMAL, settings.global_word_length);
275-
oct_number_value = window.on_programmer_convert_token (token, current_number_system, NumberSystem.OCTAL, settings.global_word_length);
276-
bin_number_value = window.on_programmer_convert_token (token, current_number_system, NumberSystem.BINARY, settings.global_word_length, true);
278+
dec_number_value = window.on_programmer_convert_token (
279+
token, current_number_system, NumberSystem.DECIMAL, settings.global_word_length);
280+
hex_number_value = window.on_programmer_convert_token (
281+
token, current_number_system, NumberSystem.HEXADECIMAL, settings.global_word_length);
282+
oct_number_value = window.on_programmer_convert_token (
283+
token, current_number_system, NumberSystem.OCTAL, settings.global_word_length);
284+
bin_number_value = window.on_programmer_convert_token (
285+
token, current_number_system, NumberSystem.BINARY, settings.global_word_length, true);
277286

278287
var bool_array_str = window.on_programmer_str_to_bool_arr (
279288
token,

0 commit comments

Comments
 (0)