diff options
| author | Brad Pitcher <bradpitcher@gmail.com> | 2011-11-01 17:15:35 (GMT) |
|---|---|---|
| committer | Brad Pitcher <bradpitcher@gmail.com> | 2011-11-01 17:15:35 (GMT) |
| commit | e2caf3726d68ff1fef63113519049abffc0563af (patch) | |
| tree | 6558c6f03ccc21e7138d23861f80e8d97b09e60e /src/MainWindow.h | |
| parent | 7541854212d6c1223e015faf55a6ca0657a1c184 (diff) | |
| parent | cb56f700b1b0f4ae589da62a5fd1d4e368deb604 (diff) | |
merge master
Diffstat (limited to 'src/MainWindow.h')
| -rw-r--r-- | src/MainWindow.h | 5 |
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(); |