From 0f67ab46b78d1772e247c4c7669fa5c5220b0b36 Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Sun, 7 Oct 2007 08:12:20 +0000 Subject: [PATCH] Transfer some more code from GuiView to TabWorkArea. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20807 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiView.cpp | 7 +------ src/frontends/qt4/GuiWorkArea.cpp | 11 +++++++++++ src/frontends/qt4/GuiWorkArea.h | 1 + 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index bd4872d955..000be9203e 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -264,12 +264,7 @@ GuiViewBase::~GuiViewBase() void GuiViewBase::close() { quitting_by_menu_ = true; - while (d.tab_widget_->count()) { - GuiWorkArea * wa = dynamic_cast(d.tab_widget_->widget(0)); - BOOST_ASSERT(wa); - d.tab_widget_->removeTab(0); - delete wa; - } + d.tab_widget_->closeAll(); QMainWindow::close(); quitting_by_menu_ = false; } diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp index 0bb9100904..dea3acd4c6 100644 --- a/src/frontends/qt4/GuiWorkArea.cpp +++ b/src/frontends/qt4/GuiWorkArea.cpp @@ -728,6 +728,17 @@ void TabWorkArea::showBar(bool show) } +void TabWorkArea::closeAll() +{ + while (count()) { + GuiWorkArea * wa = dynamic_cast(widget(0)); + BOOST_ASSERT(wa); + removeTab(0); + delete wa; + } +} + + bool TabWorkArea::setCurrentWorkArea(GuiWorkArea * work_area) { BOOST_ASSERT(work_area); diff --git a/src/frontends/qt4/GuiWorkArea.h b/src/frontends/qt4/GuiWorkArea.h index 2ddad927b0..1be94d80e3 100644 --- a/src/frontends/qt4/GuiWorkArea.h +++ b/src/frontends/qt4/GuiWorkArea.h @@ -180,6 +180,7 @@ class TabWorkArea : public QTabWidget public: TabWorkArea(QWidget * parent = 0); void showBar(bool show); + void closeAll(); bool setCurrentWorkArea(GuiWorkArea *); bool removeWorkArea(GuiWorkArea *);