From 788d2cf483ac868d2ce1e2007b578fc798853760 Mon Sep 17 00:00:00 2001 From: Christoph Egger Date: Fri, 6 Mar 2015 17:23:11 +0100 Subject: [PATCH] Move ScriptingDock contructor to cxx file --- src/gui/widgets/ScriptingDock.cxx | 21 +++++++++++++++++++++ src/gui/widgets/ScriptingDock.hxx | 21 ++------------------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/gui/widgets/ScriptingDock.cxx b/src/gui/widgets/ScriptingDock.cxx index ce00030..baf38c1 100644 --- a/src/gui/widgets/ScriptingDock.cxx +++ b/src/gui/widgets/ScriptingDock.cxx @@ -7,6 +7,27 @@ namespace { } } +ScriptingDock::ScriptingDock(const QString& title, QWidget * parent) + : QDockWidget(title, parent) + , logger(log4cxx::Logger::getLogger("ScriptingDock")) { + QTabWidget * tab = new QTabWidget; + QWidget * widget = new QWidget; + widget->setLayout(layout = new QGridLayout); + layout->addWidget(browser = new QTextBrowser, 0, 0, 1, 0); + layout->addWidget(line = new QLineEdit, 1, 0); + layout->addWidget(button = new QPushButton(tr("Evaluate")), 1, 1); + tab->addTab(widget, "GUILE"); + ((QDockWidget*)this)->setWidget(tab); + connect(button, SIGNAL(released()), this, SLOT(doEvaluate())); + connect(line, SIGNAL(returnPressed()), this, SLOT(doEvaluate())); + scm_init_guile(); + guile_output_port = scm_open_output_string(); + guile_error_port = scm_open_output_string(); + scm_set_current_output_port(guile_output_port); + scm_set_current_error_port(guile_error_port); +} + + void ScriptingDock::doEvaluate() { QString text = line->text(); line->clear(); diff --git a/src/gui/widgets/ScriptingDock.hxx b/src/gui/widgets/ScriptingDock.hxx index b6fc446..c02ec81 100644 --- a/src/gui/widgets/ScriptingDock.hxx +++ b/src/gui/widgets/ScriptingDock.hxx @@ -8,25 +8,8 @@ class ScriptingDock : public QDockWidget { Q_OBJECT public: - ScriptingDock(const QString& title, QWidget * parent = 0) - : QDockWidget(title, parent) - , logger(log4cxx::Logger::getLogger("ScriptingDock")) { - QTabWidget * tab = new QTabWidget; - QWidget * widget = new QWidget; - widget->setLayout(layout = new QGridLayout); - layout->addWidget(browser = new QTextBrowser, 0, 0, 1, 0); - layout->addWidget(line = new QLineEdit, 1, 0); - layout->addWidget(button = new QPushButton(tr("Evaluate")), 1, 1); - tab->addTab(widget, "GUILE"); - ((QDockWidget*)this)->setWidget(tab); - connect(button, SIGNAL(released()), this, SLOT(doEvaluate())); - connect(line, SIGNAL(returnPressed()), this, SLOT(doEvaluate())); - scm_init_guile(); - guile_output_port = scm_open_output_string(); - guile_error_port = scm_open_output_string(); - scm_set_current_output_port(guile_output_port); - scm_set_current_error_port(guile_error_port); - } + ScriptingDock(const QString& title, QWidget * parent = 0); + private: log4cxx::LoggerPtr logger; -- 2.39.5