From 1a111979e01a6081cbea69e40accebe16e6155e5 Mon Sep 17 00:00:00 2001
From: Alex Merry <dev@randomguy3.me.uk>
Date: Sun, 24 Mar 2013 15:52:33 +0000
Subject: Add methods to Graph to create from tikz

These are just convenience wrappers for TikzGraphAssembler.  As a
result, non of the GTK code uses TikzGraphAssembler directly.
---
 tikzit/src/gtk/TikzDocument.m | 5 ++---
 tikzit/src/gtk/main.m         | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'tikzit/src/gtk')

diff --git a/tikzit/src/gtk/TikzDocument.m b/tikzit/src/gtk/TikzDocument.m
index 78746f2..86b8afb 100644
--- a/tikzit/src/gtk/TikzDocument.m
+++ b/tikzit/src/gtk/TikzDocument.m
@@ -22,7 +22,6 @@
 //
 
 #import "TikzDocument.h"
-#import "TikzGraphAssembler.h"
 
 @interface TikzDocument (Private)
 - (void) styleRenamed:(NSNotification*)n;
@@ -264,7 +263,7 @@
         return YES;
     }
 
-    Graph *g = [TikzGraphAssembler parseTikz:t error:error];
+    Graph *g = [Graph graphFromTikz:t error:error];
     if (g) {
         // updateTikz actually generates a graph from the tikz,
         // and generates the final tikz from that
@@ -310,7 +309,7 @@
 }
 
 - (void) pasteFromTikz:(NSString*)t {
-    Graph *clipboard = [TikzGraphAssembler parseTikz:t];
+    Graph *clipboard = [Graph graphFromTikz:t];
     if (clipboard) {
         [self attachStylesToGraph:clipboard];
         [self paste:clipboard];
diff --git a/tikzit/src/gtk/main.m b/tikzit/src/gtk/main.m
index 10fa990..b6e297e 100644
--- a/tikzit/src/gtk/main.m
+++ b/tikzit/src/gtk/main.m
@@ -28,7 +28,6 @@
 #import "tzstockitems.h"
 
 #import "Application.h"
-#import "TikzGraphAssembler.h"
 
 static GOptionEntry entries[] =
 {
-- 
cgit v1.2.3