Improve wording (#10670)

[lyx.git] / src / frontends / qt4 / GuiToc.cpp

diff --git a/src/frontends/qt4/GuiToc.cpp b/src/frontends/qt4/GuiToc.cpp
index 9711bb68f6c8be99d9c71f82dc97f4dc35c32ab0..e124a468b428c48cf161d2341fa84c5633d973f2 100644 (file)
--- a/src/frontends/qt4/GuiToc.cpp
+++ b/src/frontends/qt4/GuiToc.cpp
@@ -33,24 +33,18 @@ namespace lyx {
 namespace frontend {
 
 GuiToc::GuiToc(GuiView & parent, Qt::DockWidgetArea area, Qt::WindowFlags flags)
-       : DockView(parent, "toc", qt_("Outline"), area, flags), is_closing_(false)
+       : DockView(parent, "toc", qt_("Outline"), area, flags),
+         widget_(new TocWidget(parent, this)),
+         is_closing_(false)
 {
-       widget_ = new TocWidget(parent, this);
        setWidget(widget_);
        setFocusProxy(widget_);
 }
 
 
-GuiToc::~GuiToc()
-{
-       delete widget_;
-}
-
-
 void GuiToc::updateView()
 {
        widget_->updateView();
-       return;
 }
 
 
@@ -70,14 +64,14 @@ void GuiToc::enableView(bool enable)
 {
        if (!enable)
                // In the opposite case, updateView() will be called anyway.
-               widget_->updateView();
+               widget_->updateViewNow();
 }
 
 
 void GuiToc::closeEvent(QCloseEvent * /*event*/)
 {
        is_closing_ = true;
-       ((GuiView *)parent())->updateToolbars();
+       static_cast<GuiView *>(parent())->updateToolbars();
        is_closing_ = false;
 }
 
@@ -97,15 +91,7 @@ bool GuiToc::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 Dialog * createGuiToc(GuiView & lv)
 {
-       GuiToc * toc;
-#ifdef Q_WS_MACX
-       // On Mac show at the right and floating
-       toc = new GuiToc(lv, Qt::RightDockWidgetArea);
-       toc->setFloating(true);
-#else
-       toc = new GuiToc(lv);
-#endif
-       return toc;
+       return new GuiToc(lv);
 }