diff options
author | Alex Merry <dev@randomguy3.me.uk> | 2013-08-07 00:43:49 +0100 |
---|---|---|
committer | Alex Merry <dev@randomguy3.me.uk> | 2013-08-07 00:45:50 +0100 |
commit | 5a94458d9ee3ee8afd978477c755200df432a9b0 (patch) | |
tree | bea24359a6300f4dd2ce4d1ad517f63a52cca972 /tikzit/src/gtk | |
parent | e306c53d9e31c7ee09a131c765cbcec67fdd2565 (diff) |
Add variant of stringWithContentsOfFile that produces an error
It turns out that the [NSString stringWithContentsOfFile:] family of
methods do not have a way of reporting why a file could not be read;
[NSString stringWithContentsOfFile:usedEncoding:error:] will only set
the error object if there was a problem with decoding.
So, we cook our own variant that tries to figure out why opening the
file failed.
User-visible effect: in the GTK+ port, if you try to open a file from
the "open recent" menu that no longer exists, you will get a more
helpful error message.
Diffstat (limited to 'tikzit/src/gtk')
-rw-r--r-- | tikzit/src/gtk/TZFoundation.h | 1 | ||||
-rw-r--r-- | tikzit/src/gtk/TikzDocument.m | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tikzit/src/gtk/TZFoundation.h b/tikzit/src/gtk/TZFoundation.h index f275004..2ff20ca 100644 --- a/tikzit/src/gtk/TZFoundation.h +++ b/tikzit/src/gtk/TZFoundation.h @@ -25,5 +25,6 @@ #import "NSString+Glib.h" #import "NSString+LatexConstants.h" #import "NSString+Tikz.h" +#import "NSString+Util.h" // vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/TikzDocument.m b/tikzit/src/gtk/TikzDocument.m index 6e013b1..bff5a2e 100644 --- a/tikzit/src/gtk/TikzDocument.m +++ b/tikzit/src/gtk/TikzDocument.m @@ -139,9 +139,7 @@ styleManager:(StyleManager*)manager error:(NSError**)error { - NSStringEncoding enc; // we can't pass in NULL here... - NSString *t = [NSString stringWithContentsOfFile:pth - usedEncoding:&enc error:error]; + NSString *t = [NSString stringWithContentsOfFile:pth error:error]; if (t == nil) { [self release]; return nil; |