[gitg/ricotz/vala: 3/3] Fix inproper usages of silent casts
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg/ricotz/vala: 3/3] Fix inproper usages of silent casts
- Date: Mon, 22 Feb 2021 12:15:01 +0000 (UTC)
commit 06bbf4da41433d2294e891cbfdada4a52a955d03
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Mon Feb 22 13:08:08 2021 +0100
Fix inproper usages of silent casts
gitg/gitg-window.vala | 2 +-
libgitg/gitg-diff-view-file-renderer-text.vala | 2 +-
libgitg/gitg-diff-view-file-selectable.vala | 16 ++++++++--------
libgitg/gitg-diff-view.vala | 12 ++++++------
4 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/gitg/gitg-window.vala b/gitg/gitg-window.vala
index adfd4538..4b60e045 100644
--- a/gitg/gitg-window.vala
+++ b/gitg/gitg-window.vala
@@ -259,7 +259,7 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable
private void search_entry_changed(Gtk.Editable entry)
{
var searchable = current_activity as GitgExt.Searchable;
- var ntext = (entry as Gtk.Entry).text;
+ var ntext = ((Gtk.Entry) entry).text;
if (ntext != searchable.search_text)
{
diff --git a/libgitg/gitg-diff-view-file-renderer-text.vala b/libgitg/gitg-diff-view-file-renderer-text.vala
index 81749d1f..cabbca9a 100644
--- a/libgitg/gitg-diff-view-file-renderer-text.vala
+++ b/libgitg/gitg-diff-view-file-renderer-text.vala
@@ -442,7 +442,7 @@ class Gitg.DiffViewFileRendererText : Gtk.SourceView, DiffSelectable, DiffViewFi
if (s != null)
{
- (buffer as Gtk.SourceBuffer).style_scheme = s;
+ ((Gtk.SourceBuffer) buffer).style_scheme = s;
}
}
diff --git a/libgitg/gitg-diff-view-file-selectable.vala b/libgitg/gitg-diff-view-file-selectable.vala
index 369d7ae6..c80fe9a5 100644
--- a/libgitg/gitg-diff-view-file-selectable.vala
+++ b/libgitg/gitg-diff-view-file-selectable.vala
@@ -50,7 +50,7 @@ class Gitg.DiffViewFileSelectable : Object
var ret = new int[0];
Gtk.TextIter iter;
- var buffer = source_view.buffer as Gtk.SourceBuffer;
+ unowned Gtk.SourceBuffer buffer = (Gtk.SourceBuffer) source_view.buffer;
buffer.get_start_iter(out iter);
@@ -161,7 +161,7 @@ class Gitg.DiffViewFileSelectable : Object
start.set_line_offset(0);
- var buffer = source_view.buffer as Gtk.SourceBuffer;
+ unowned Gtk.SourceBuffer buffer = (Gtk.SourceBuffer) source_view.buffer;
return buffer.get_source_marks_at_iter(start, d_selection_category) != null;
}
@@ -172,7 +172,7 @@ class Gitg.DiffViewFileSelectable : Object
start.set_line_offset(0);
- var buffer = source_view.buffer as Gtk.SourceBuffer;
+ unowned Gtk.SourceBuffer buffer = (Gtk.SourceBuffer) source_view.buffer;
return (buffer.get_source_marks_at_iter(start, "added") != null) ||
(buffer.get_source_marks_at_iter(start, "removed") != null);
@@ -184,7 +184,7 @@ class Gitg.DiffViewFileSelectable : Object
start.set_line_offset(0);
- var buffer = source_view.buffer as Gtk.SourceBuffer;
+ unowned Gtk.SourceBuffer buffer = (Gtk.SourceBuffer) source_view.buffer;
return buffer.get_source_marks_at_iter(start, "header") != null;
}
@@ -225,7 +225,7 @@ class Gitg.DiffViewFileSelectable : Object
private void update_selection_range(Gtk.TextIter start, Gtk.TextIter end, bool select)
{
- var buffer = source_view.buffer as Gtk.SourceBuffer;
+ unowned Gtk.SourceBuffer buffer = (Gtk.SourceBuffer) source_view.buffer;
Gtk.TextIter real_start, real_end;
@@ -319,7 +319,7 @@ class Gitg.DiffViewFileSelectable : Object
{
iter.forward_line();
- var buffer = source_view.buffer as Gtk.SourceBuffer;
+ unowned Gtk.SourceBuffer buffer = (Gtk.SourceBuffer) source_view.buffer;
if (!buffer.forward_iter_to_source_mark(ref iter, "header"))
{
@@ -480,7 +480,7 @@ class Gitg.DiffViewFileSelectable : Object
private void update_has_selection()
{
- var buffer = source_view.buffer;
+ unowned Gtk.SourceBuffer buffer = (Gtk.SourceBuffer) source_view.buffer;
Gtk.TextIter iter;
buffer.get_start_iter(out iter);
@@ -493,7 +493,7 @@ class Gitg.DiffViewFileSelectable : Object
}
else
{
- something_selected = (buffer as Gtk.SourceBuffer).forward_iter_to_source_mark(ref
iter, d_selection_category);
+ something_selected = buffer.forward_iter_to_source_mark(ref iter,
d_selection_category);
}
if (something_selected != has_selection)
diff --git a/libgitg/gitg-diff-view.vala b/libgitg/gitg-diff-view.vala
index 22495664..2ec9c031 100644
--- a/libgitg/gitg-diff-view.vala
+++ b/libgitg/gitg-diff-view.vala
@@ -245,7 +245,7 @@ public class Gitg.DiffView : Gtk.Grid
foreach (var file in d_grid_files.get_children())
{
- (file as Gitg.DiffViewFile).expanded = expanded;
+ ((Gitg.DiffViewFile) file).expanded = expanded;
}
}
@@ -642,9 +642,9 @@ public class Gitg.DiffView : Gtk.Grid
foreach (var file in d_grid_files.get_children())
{
- var selectable = (file as Gitg.DiffViewFile).renderer as DiffSelectable;
+ var selectable = ((Gitg.DiffViewFile) file).renderer as DiffSelectable;
- if (selectable.has_selection)
+ if (selectable != null && selectable.has_selection)
{
something_selected = true;
break;
@@ -894,7 +894,7 @@ public class Gitg.DiffView : Gtk.Grid
foreach (var file in file_widgets)
{
- var f = file as Gitg.DiffViewFile;
+ unowned DiffViewFile f = (DiffViewFile) file;
if (preserve_expanded && f.expanded)
{
@@ -944,7 +944,7 @@ public class Gitg.DiffView : Gtk.Grid
{
foreach (var file in d_grid_files.get_children())
{
- if (!(file as Gitg.DiffViewFile).expanded)
+ if (!((Gitg.DiffViewFile) file).expanded)
{
auto_change_expanded(false);
return;
@@ -960,7 +960,7 @@ public class Gitg.DiffView : Gtk.Grid
foreach (var file in d_grid_files.get_children())
{
- var sel = (file as Gitg.DiffViewFile).renderer as DiffSelectable;
+ var sel = ((Gitg.DiffViewFile) file).renderer as DiffSelectable;
if (sel != null && sel.has_selection && sel.selection.patches.length != 0)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]