diff options
author | kintel <kintel@b57f626f-c46c-0410-a088-ec61d464b74c> | 2010-01-06 21:35:01 (GMT) |
---|---|---|
committer | kintel <kintel@b57f626f-c46c-0410-a088-ec61d464b74c> | 2010-01-06 21:35:01 (GMT) |
commit | 480c3badb1da98bceed223b3d116608793ca8455 (patch) | |
tree | 76c3a1b4fdb3156a262f85d913c8a13bdfc6a5dd /MainWindow.h | |
parent | c342e41e2f5084ac37b0a92f04c75949d5f352e9 (diff) |
bugfix: recent files were broken, added File->Close, simplified file I/O using QTextStream, removed side-effect of find_root_node
git-svn-id: http://svn.clifford.at/openscad/trunk@223 b57f626f-c46c-0410-a088-ec61d464b74c
Diffstat (limited to 'MainWindow.h')
-rw-r--r-- | MainWindow.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/MainWindow.h b/MainWindow.h index c02162a..fd5aa7f 100644 --- a/MainWindow.h +++ b/MainWindow.h @@ -20,8 +20,10 @@ public: double tval, fps, fsteps; Context root_ctx; - AbstractModule *root_module; - AbstractNode *absolute_root_node; + AbstractModule *root_module; // Result of parsing + AbstractNode *absolute_root_node; // Result of tree evaluation + AbstractNode *root_node; // Root if the root modifier (!) is used + CSGTerm *root_raw_term; CSGTerm *root_norm_term; CSGChain *root_chain; @@ -36,7 +38,6 @@ public: CSGChain *highlights_chain; QVector<CSGTerm*> background_terms; CSGChain *background_chain; - AbstractNode *root_node; QString last_compiled_doc; bool enableOpenCSG; @@ -57,7 +58,7 @@ private slots: private: void openFile(const QString &filename); void load(); - void find_root_tag(AbstractNode *n); + AbstractNode *find_root_tag(AbstractNode *n); void compile(bool procevents); bool maybeSave(); |