diff options
| author | Brad Pitcher <bradpitcher@gmail.com> | 2011-11-01 18:29:29 (GMT) |
|---|---|---|
| committer | Brad Pitcher <bradpitcher@gmail.com> | 2011-11-01 18:29:29 (GMT) |
| commit | 0eacddfd8148f14ee0ddfe2eb66b82774c88afbe (patch) | |
| tree | 6982ea59564090ea858d12d86d3699e83887f1f9 /src/MainWindow.h | |
| parent | ea7e4988d44249946b620d5973b230cf1a0606ca (diff) | |
| parent | e2caf3726d68ff1fef63113519049abffc0563af (diff) | |
merge master
Diffstat (limited to 'src/MainWindow.h')
| -rw-r--r-- | src/MainWindow.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/MainWindow.h b/src/MainWindow.h index a3c812b..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(); |