Revert 22023 and really fix bug 4410 (http://bugzilla.lyx.org/show_bug.cgi?id=4410).

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

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index fb30aba07e1a127e518a8581cfa7a897a039c19f..93d1f19efa35aea22bccc437dd407036c136bd4b 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -22,9 +22,8 @@
 #include "EmbeddedFiles.h"
 #include "Encoding.h"
 #include "FloatPlacement.h"
-#include "frontend_helpers.h"
 #include "FuncRequest.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "GuiBranches.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
@@ -41,14 +40,10 @@
 #include "TextClassList.h"
 #include "Validator.h"
 
-
-// FIXME: those two headers are needed because of the
-// WorkArea::redraw() call below.
-#include "frontends/LyXView.h"
-#include "frontends/WorkArea.h"
-
 #include "insets/InsetListingsParams.h"
 
+#include "support/FileName.h"
+#include "support/filetools.h"
 #include "support/lstrings.h"
 
 #include <boost/bind.hpp>
@@ -219,7 +214,7 @@ void PreambleModule::closeEvent(QCloseEvent * e)
 
 
 
-GuiDocument::GuiDocument(LyXView & lv)
+GuiDocument::GuiDocument(GuiView & lv)
        : GuiDialog(lv, "document")
 {
        setupUi(this);
@@ -1245,9 +1240,9 @@ void GuiDocument::apply(BufferParams & params)
                pageLayoutModule->paperheightUnitCO);
 
        if (pageLayoutModule->facingPagesCB->isChecked())
-               params.sides = TextClass::TwoSides;
+               params.sides = TwoSides;
        else
-               params.sides = TextClass::OneSide;
+               params.sides = OneSide;
 
        if (pageLayoutModule->landscapeRB->isChecked())
                params.orientation = ORIENTATION_LANDSCAPE;
@@ -1542,7 +1537,7 @@ void GuiDocument::updateParams(BufferParams const & params)
        pageLayoutModule->portraitRB->setChecked(!landscape);
 
        pageLayoutModule->facingPagesCB->setChecked(
-               params.sides == TextClass::TwoSides);
+               params.sides == TwoSides);
 
 
        lengthToWidgets(pageLayoutModule->paperwidthLE,
@@ -1848,7 +1843,7 @@ void GuiDocument::loadModuleNames ()
 }
 
 
-Dialog * createGuiDocument(LyXView & lv) { return new GuiDocument(lv); }
+Dialog * createGuiDocument(GuiView & lv) { return new GuiDocument(lv); }
 
 
 } // namespace frontend