* fix spelling in comments to please John.

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

diff --git a/src/frontends/qt4/GuiVSpace.cpp b/src/frontends/qt4/GuiVSpace.cpp
index dbf611636663c62a6200c8e2b2636becd17a253d..70d2ba7e6e4f7ffc642969da6645207bf8024ccf 100644 (file)
--- a/src/frontends/qt4/GuiVSpace.cpp
+++ b/src/frontends/qt4/GuiVSpace.cpp
@@ -3,12 +3,12 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
- * \author Jürgen Vigna
+ * \author André Pönitz
+ * \author Jürgen Vigna
  * \author Rob Lahaye
  * \author Angus Leeming
  * \author Edwin Leuven
- * \author Jürgen Spitzmüller
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -21,9 +21,9 @@
 #include "qt_helpers.h"
 #include "Validator.h"
 
-#include "LyXRC.h" // to set the default length values
 #include "Spacing.h"
 #include "FuncRequest.h"
+
 #include "insets/InsetVSpace.h"
 
 #include "support/gettext.h"
@@ -59,7 +59,7 @@ GuiVSpace::GuiVSpace(GuiView & lv)
        connect(unitCO, SIGNAL(selectionChanged(lyx::Length::UNIT)),
                this, SLOT(change_adaptor()));
 
-       valueLE->setValidator(unsignedLengthValidator(valueLE));
+       valueLE->setValidator(unsignedGlueLengthValidator(valueLE));
 
        // Manage the ok, apply, restore and cancel/close buttons
        bc().setPolicy(ButtonPolicy::OkApplyCancelReadOnlyPolicy);
@@ -75,9 +75,6 @@ GuiVSpace::GuiVSpace(GuiView & lv)
 
        // initialize the length validator
        bc().addCheckedLineEdit(valueLE, valueL);
-
-       // remove the %-items from the unit choice
-       unitCO->noPercents();
 }
 
 
@@ -113,8 +110,7 @@ static void setWidgetsFromVSpace(VSpace const & space,
        spacing->setCurrentIndex(item);
        keep->setChecked(space.keep());
 
-       Length::UNIT default_unit =
-                       (lyxrc.default_papersize > 3) ? Length::CM : Length::IN;
+       Length::UNIT const default_unit = Length::defaultUnit();
        bool const custom_vspace = space.kind() == VSpace::LENGTH;
        if (custom_vspace) {
                value->setEnabled(true);
@@ -168,9 +164,8 @@ void GuiVSpace::updateContents()
 
 bool GuiVSpace::initialiseParams(string const & data)
 {
-       InsetVSpaceMailer::string2params(data, params_);
+       InsetVSpace::string2params(data, params_);
        setButtonsValid(true);
-
        return true;
 }
 
@@ -183,7 +178,7 @@ void GuiVSpace::clearParams()
 
 void GuiVSpace::dispatchParams()
 {
-       dispatch(FuncRequest(getLfun(), InsetVSpaceMailer::params2string(params_)));
+       dispatch(FuncRequest(getLfun(), InsetVSpace::params2string(params_)));
 }
 
 
@@ -194,4 +189,4 @@ Dialog * createGuiVSpace(GuiView & lv) { return new GuiVSpace(lv); }
 } // namespace lyx
 
 
-#include "GuiVSpace_moc.cpp"
+#include "moc_GuiVSpace.cpp"