summaryrefslogtreecommitdiff
path: root/src/MainWindow.h
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2013-04-27 05:01:45 (GMT)
committerMarius Kintel <marius@kintel.net>2013-04-27 05:01:45 (GMT)
commit17df3f6275fce73119c311cc73a6ad057d3b47ee (patch)
tree6c907e241b53c40c10743bbf08754b86a13f6457 /src/MainWindow.h
parent6b3daa748543f13cc7cf8eff1c9efeebd6dc3a14 (diff)
parent7858b0443e7fb09134f2b69a535417688353c0bb (diff)
Merge pull request #328 from openscad/issue116
Issue116
Diffstat (limited to 'src/MainWindow.h')
-rw-r--r--src/MainWindow.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/MainWindow.h b/src/MainWindow.h
index 8745b8b..65deb15 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -4,7 +4,7 @@
#include <QMainWindow>
#include "ui_MainWindow.h"
#include "openscad.h"
-#include "context.h"
+#include "modcontext.h"
#include "module.h"
#include "Tree.h"
#include "memory.h"
@@ -29,7 +29,7 @@ public:
QTimer *autoReloadTimer;
std::string autoReloadId;
- Context root_ctx;
+ ModuleContext root_ctx;
Module *root_module; // Result of parsing
ModuleInstantiation root_inst; // Top level instance
AbstractNode *absolute_root_node; // Result of tree evaluation
contact: Jan Huwald // Impressum