From f4eba18ff67fb35bdedf6786c69655541327275f Mon Sep 17 00:00:00 2001 From: Sergey Date: Tue, 9 Mar 2021 19:04:43 +0300 Subject: [PATCH] Fix some typos in variable names (#1016) * Fix WelcomePlaceholder typo * Fix DEFAULT_TABLE_NAME typo --- main/src/ui/main_window.vala | 6 ++--- qlite/src/column.vala | 52 ++++++++++++++++++------------------ 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/main/src/ui/main_window.vala b/main/src/ui/main_window.vala index 28e2bbd9..df24038a 100644 --- a/main/src/ui/main_window.vala +++ b/main/src/ui/main_window.vala @@ -13,7 +13,7 @@ public class MainWindow : Gtk.Window { public new string? title { get; set; } public string? subtitle { get; set; } - public WelcomePlceholder welcome_placeholder = new WelcomePlceholder() { visible=true }; + public WelcomePlaceholder welcome_placeholder = new WelcomePlaceholder() { visible=true }; public NoAccountsPlaceholder accounts_placeholder = new NoAccountsPlaceholder() { visible=true }; public ConversationView conversation_view; public ConversationSelector conversation_selector; @@ -193,8 +193,8 @@ public class MainWindow : Gtk.Window { } } -public class WelcomePlceholder : MainWindowPlaceholder { - public WelcomePlceholder() { +public class WelcomePlaceholder : MainWindowPlaceholder { + public WelcomePlaceholder() { title_label.label = _("Welcome to Dino!"); label.label = _("Sign in or create an account to get started."); primary_button.label = _("Set up account"); diff --git a/qlite/src/column.vala b/qlite/src/column.vala index 45385f38..36c8fcff 100644 --- a/qlite/src/column.vala +++ b/qlite/src/column.vala @@ -3,7 +3,7 @@ using Sqlite; namespace Qlite { public abstract class Column { - public const string DEFALT_TABLE_NAME = ""; + public const string DEFAULT_TABLE_NAME = ""; public string name { get; private set; } public string? default { get; set; } @@ -16,9 +16,9 @@ public abstract class Column { public long max_version { get; set; default = long.MAX; } internal Table table { get; set; } - public abstract T get(Row row, string? table_name = DEFALT_TABLE_NAME); + public abstract T get(Row row, string? table_name = DEFAULT_TABLE_NAME); - public virtual bool is_null(Row row, string? table_name = DEFALT_TABLE_NAME) { + public virtual bool is_null(Row row, string? table_name = DEFAULT_TABLE_NAME) { return false; } @@ -65,12 +65,12 @@ public abstract class Column { base(name, INTEGER); } - public override int get(Row row, string? table_name = DEFALT_TABLE_NAME) { - return (int) row.get_integer(name, table_name == DEFALT_TABLE_NAME ? table.name : table_name); + public override int get(Row row, string? table_name = DEFAULT_TABLE_NAME) { + return (int) row.get_integer(name, table_name == DEFAULT_TABLE_NAME ? table.name : table_name); } - public override bool is_null(Row row, string? table_name = DEFALT_TABLE_NAME) { - return !row.has_integer(name, table_name == DEFALT_TABLE_NAME ? table.name : table_name); + public override bool is_null(Row row, string? table_name = DEFAULT_TABLE_NAME) { + return !row.has_integer(name, table_name == DEFAULT_TABLE_NAME ? table.name : table_name); } internal override void bind(Statement stmt, int index, int value) { @@ -83,12 +83,12 @@ public abstract class Column { base(name, INTEGER); } - public override long get(Row row, string? table_name = DEFALT_TABLE_NAME) { - return (long) row.get_integer(name, table_name == DEFALT_TABLE_NAME ? table.name : table_name); + public override long get(Row row, string? table_name = DEFAULT_TABLE_NAME) { + return (long) row.get_integer(name, table_name == DEFAULT_TABLE_NAME ? table.name : table_name); } - public override bool is_null(Row row, string? table_name = DEFALT_TABLE_NAME) { - return !row.has_integer(name, table_name == DEFALT_TABLE_NAME ? table.name : table_name); + public override bool is_null(Row row, string? table_name = DEFAULT_TABLE_NAME) { + return !row.has_integer(name, table_name == DEFAULT_TABLE_NAME ? table.name : table_name); } internal override void bind(Statement stmt, int index, long value) { @@ -103,12 +103,12 @@ public abstract class Column { public override bool not_null { get { return false; } set {} } - public override double? get(Row row, string? table_name = DEFALT_TABLE_NAME) { - return row.get_real(name, table_name == DEFALT_TABLE_NAME ? table.name : table_name); + public override double? get(Row row, string? table_name = DEFAULT_TABLE_NAME) { + return row.get_real(name, table_name == DEFAULT_TABLE_NAME ? table.name : table_name); } - public override bool is_null(Row row, string? table_name = DEFALT_TABLE_NAME) { - return !row.has_real(name, table_name == DEFALT_TABLE_NAME ? table.name : table_name); + public override bool is_null(Row row, string? table_name = DEFAULT_TABLE_NAME) { + return !row.has_real(name, table_name == DEFAULT_TABLE_NAME ? table.name : table_name); } internal override void bind(Statement stmt, int index, double? value) { @@ -121,12 +121,12 @@ public abstract class Column { base(name, TEXT); } - public override string? get(Row row, string? table_name = DEFALT_TABLE_NAME) { - return row.get_text(name, table_name == DEFALT_TABLE_NAME ? table.name : table_name); + public override string? get(Row row, string? table_name = DEFAULT_TABLE_NAME) { + return row.get_text(name, table_name == DEFAULT_TABLE_NAME ? table.name : table_name); } - public override bool is_null(Row row, string? table_name = DEFALT_TABLE_NAME) { - return get(row, table_name == DEFALT_TABLE_NAME ? table.name : table_name) == null; + public override bool is_null(Row row, string? table_name = DEFAULT_TABLE_NAME) { + return get(row, table_name == DEFAULT_TABLE_NAME ? table.name : table_name) == null; } internal override void bind(Statement stmt, int index, string? value) { @@ -145,11 +145,11 @@ public abstract class Column { public override bool not_null { get { return true; } set {} } - public override string get(Row row, string? table_name = DEFALT_TABLE_NAME) { - return (!)row.get_text(name, table_name == DEFALT_TABLE_NAME ? table.name : table_name); + public override string get(Row row, string? table_name = DEFAULT_TABLE_NAME) { + return (!)row.get_text(name, table_name == DEFAULT_TABLE_NAME ? table.name : table_name); } - public override bool is_null(Row row, string? table_name = DEFALT_TABLE_NAME) { + public override bool is_null(Row row, string? table_name = DEFAULT_TABLE_NAME) { return false; } @@ -163,8 +163,8 @@ public abstract class Column { base(name, TEXT); } - public override bool get(Row row, string? table_name = DEFALT_TABLE_NAME) { - return row.get_text(name, table_name == DEFALT_TABLE_NAME ? table.name : table_name) == "1"; + public override bool get(Row row, string? table_name = DEFAULT_TABLE_NAME) { + return row.get_text(name, table_name == DEFAULT_TABLE_NAME ? table.name : table_name) == "1"; } internal override void bind(Statement stmt, int index, bool value) { @@ -177,8 +177,8 @@ public abstract class Column { base(name, INTEGER); } - public override bool get(Row row, string? table_name = DEFALT_TABLE_NAME) { - return row.get_integer(name, table_name == DEFALT_TABLE_NAME ? table.name : table_name) == 1; + public override bool get(Row row, string? table_name = DEFAULT_TABLE_NAME) { + return row.get_integer(name, table_name == DEFAULT_TABLE_NAME ? table.name : table_name) == 1; } internal override void bind(Statement stmt, int index, bool value) {