summaryrefslogtreecommitdiff
path: root/src/MainWindow.h
diff options
context:
space:
mode:
authorkintel <kintel@b57f626f-c46c-0410-a088-ec61d464b74c>2010-02-28 20:54:55 (GMT)
committerkintel <kintel@b57f626f-c46c-0410-a088-ec61d464b74c>2010-02-28 20:54:55 (GMT)
commit7095f825eb63b3f9ea5663a162ea6c69935d8304 (patch)
tree531bb96256fbde93536fe3c00e9e7f4a350414f0 /src/MainWindow.h
parent88be59d3db1bda2128d136fcf51a02a1372ccee5 (diff)
Removed MainWindow::current_win - made this a tiny bit better, decoupled MainWindow from printutils
git-svn-id: http://svn.clifford.at/openscad/trunk@467 b57f626f-c46c-0410-a088-ec61d464b74c
Diffstat (limited to 'src/MainWindow.h')
-rw-r--r--src/MainWindow.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/MainWindow.h b/src/MainWindow.h
index 192a9b5..7623789 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -14,7 +14,6 @@ class MainWindow : public QMainWindow, public Ui::MainWindow
Q_OBJECT
public:
- static QPointer<MainWindow> current_win;
static void requestOpenFile(const QString &filename);
QString fileName;
@@ -73,6 +72,9 @@ private:
void compile(bool procevents);
void compileCSG(bool procevents);
bool maybeSave();
+ static void consoleOutput(const QString &msg, void *userdata) {
+ static_cast<MainWindow*>(userdata)->console->append(msg);
+ }
private slots:
void actionNew();
@@ -111,6 +113,8 @@ private slots:
public:
void viewModeActionsUncheck();
+ void setCurrentOutput();
+ void clearCurrentOutput();
public slots:
#ifdef ENABLE_OPENCSG
contact: Jan Huwald // Impressum