summaryrefslogtreecommitdiff
path: root/src/MainWindow.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/MainWindow.h')
-rw-r--r--src/MainWindow.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/MainWindow.h b/src/MainWindow.h
index 37a6a4c..06332b0 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -79,8 +79,8 @@ private:
bool maybeSave();
bool checkModified();
QString dumpCSGTree(AbstractNode *root);
- static void consoleOutput(const QString &msg, void *userdata) {
- static_cast<MainWindow*>(userdata)->console->append(msg);
+ static void consoleOutput(const std::string &msg, void *userdata) {
+ static_cast<MainWindow*>(userdata)->console->append(QString::fromStdString(msg));
}
void loadViewSettings();
void loadDesignSettings();
@@ -115,6 +115,7 @@ private slots:
void actionExportSTL();
void actionExportOFF();
void actionExportDXF();
+ void actionExportCSG();
void actionExportImage();
void actionFlushCaches();
contact: Jan Huwald // Impressum