[latexila] Use Utils.load_file() (simplify the code)
- From: SÃbastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [latexila] Use Utils.load_file() (simplify the code)
- Date: Sat, 10 Mar 2012 20:57:47 +0000 (UTC)
commit cb6671e2c4390ee7ea76a07c8985a89f2d76bb05
Author: SÃbastien Wilmet <swilmet src gnome org>
Date: Sat Mar 10 21:57:32 2012 +0100
Use Utils.load_file() (simplify the code)
src/build_tools.vala | 14 +++++++-------
src/completion.vala | 13 +++++++------
src/most_used_symbols.vala | 8 ++++----
src/projects.vala | 8 ++++----
4 files changed, 22 insertions(+), 21 deletions(-)
---
diff --git a/src/build_tools.vala b/src/build_tools.vala
index 65dd50b..34c4a7a 100644
--- a/src/build_tools.vala
+++ b/src/build_tools.vala
@@ -263,15 +263,15 @@ public class BuildTools
foreach (File file in files)
{
- try
- {
- if (! file.query_exists ())
- continue;
+ if (! file.query_exists ())
+ continue;
- uint8[] chars;
- file.load_contents (null, out chars, null);
- string contents = (string) (owned) chars;
+ string? contents = Utils.load_file (file);
+ if (contents == null)
+ continue;
+ try
+ {
MarkupParser parser =
{ parser_start, parser_end, parser_text, null, null };
MarkupParseContext context =
diff --git a/src/completion.vala b/src/completion.vala
index f89aa17..66da561 100644
--- a/src/completion.vala
+++ b/src/completion.vala
@@ -766,14 +766,15 @@ public class CompletionProvider : GLib.Object, SourceCompletionProvider
_commands = new Gee.HashMap<string, CompletionCommand?> ();
_environments = new Gee.HashMap<string, CompletionChoice?> ();
- try
- {
- File file = File.new_for_path (Config.DATA_DIR + "/completion.xml");
+ File file = File.new_for_path (
+ Path.build_filename (Config.DATA_DIR, "completion.xml"));
- uint8[] chars;
- file.load_contents (null, out chars, null);
- string contents = (string) (owned) chars;
+ string? contents = Utils.load_file (file);
+ if (contents == null)
+ return;
+ try
+ {
MarkupParser parser = { parser_start, parser_end, parser_text, null, null };
MarkupParseContext context = new MarkupParseContext (parser, 0, this, null);
context.parse (contents, -1);
diff --git a/src/most_used_symbols.vala b/src/most_used_symbols.vala
index 976aacc..cf30056 100644
--- a/src/most_used_symbols.vala
+++ b/src/most_used_symbols.vala
@@ -45,12 +45,12 @@ public class MostUsedSymbols : GLib.Object
if (! file.query_exists ())
return;
+ string? contents = Utils.load_file (file);
+ if (contents == null)
+ return;
+
try
{
- uint8[] chars;
- file.load_contents (null, out chars, null);
- string contents = (string) (owned) chars;
-
MarkupParser parser = { parser_start, null, null, null, null };
MarkupParseContext context = new MarkupParseContext (parser, 0, this, null);
context.parse (contents, -1);
diff --git a/src/projects.vala b/src/projects.vala
index 32512a6..4f74682 100644
--- a/src/projects.vala
+++ b/src/projects.vala
@@ -41,12 +41,12 @@ public class Projects
if (! file.query_exists ())
return;
+ string? contents = Utils.load_file (file);
+ if (contents == null)
+ return;
+
try
{
- uint8[] chars;
- file.load_contents (null, out chars, null);
- string contents = (string) (owned) chars;
-
MarkupParser parser = { parser_start, null, null, null, null };
MarkupParseContext context = new MarkupParseContext (parser, 0, this, null);
context.parse (contents, -1);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]