+2001-12-05 John Levon <moz@compsoc.man.ac.uk>
+
+ * QParagraph.C:
+ * QParagraphDialog.h:
+ * QParagraphDialog.C: use new vspace API
+
+ * QTocDialog.C: silence warnings
+
2001-12-05 Lars Gullik Bjønnes <larsbj@birdstep.com>
* qttableview.C: change "while(" to "while ("
void QIndex::update_contents()
{
- dialog_->keywordED->setText(controller().getContents().c_str());
+ dialog_->keywordED->setText(controller().params().getContents().c_str());
}
void QIndex::apply()
{
- controller().setContents(dialog_->keywordED->text().latin1());
+ controller().params().setContents(dialog_->keywordED->text().latin1());
}
if (params->spaceTop().kind() == VSpace::LENGTH) {
LyXGlueLength above = params->spaceTop().length();
lyxerr[Debug::GUI] << "Reading above space : \"" << params->spaceTop().length().asString() << "\"" << endl;
- dialog_->setAboveLength(above.value(), above.plusValue(), above.minusValue(),
- above.unit(), above.plusUnit(), above.minusUnit());
+ dialog_->setAboveLength(above.len().value(), above.plus().value(), above.minus().value(),
+ above.len().unit(), above.plus().unit(), above.minus().unit());
} else
dialog_->setAboveLength(0.0, 0.0, 0.0, LyXLength::UNIT_NONE, LyXLength::UNIT_NONE, LyXLength::UNIT_NONE);
if (params->spaceBottom().kind() == VSpace::LENGTH) {
LyXGlueLength below = params->spaceBottom().length();
lyxerr[Debug::GUI] << "Reading below space : \"" << params->spaceBottom().length().asString() << "\"" << endl;
- dialog_->setBelowLength(below.value(), below.plusValue(), below.minusValue(),
- below.unit(), below.plusUnit(), below.minusUnit());
+ dialog_->setBelowLength(below.len().value(), below.plus().value(), below.minus().value(),
+ below.len().unit(), below.plus().unit(), below.minus().unit());
} else
dialog_->setBelowLength(0.0, 0.0, 0.0, LyXLength::UNIT_NONE, LyXLength::UNIT_NONE, LyXLength::UNIT_NONE);
LyXGlueLength QParagraphDialog::getAboveLength() const
{
LyXGlueLength len(
- spacingAboveValue->text().toFloat(),
- getLyXLength( spacingAboveValueUnit->currentItem() ),
- spacingAbovePlus->text().toFloat(),
- getLyXLength( spacingAbovePlusUnit->currentItem() ),
- spacingAboveMinus->text().toFloat(),
- getLyXLength( spacingAboveMinusUnit->currentItem() )
+ LyXLength(spacingAboveValue->text().toFloat(),
+ getLyXLength(spacingAboveValueUnit->currentItem())),
+ LyXLength(spacingAbovePlus->text().toFloat(),
+ getLyXLength(spacingAbovePlusUnit->currentItem())),
+ LyXLength(spacingAboveMinus->text().toFloat(),
+ getLyXLength(spacingAboveMinusUnit->currentItem()))
);
return len;
}
LyXGlueLength QParagraphDialog::getBelowLength() const
{
LyXGlueLength len(
- spacingBelowValue->text().toFloat(),
- getLyXLength( spacingBelowValueUnit->currentItem() ),
- spacingBelowPlus->text().toFloat(),
- getLyXLength( spacingBelowPlusUnit->currentItem() ),
- spacingBelowMinus->text().toFloat(),
- getLyXLength( spacingBelowMinusUnit->currentItem() )
+ LyXLength(spacingBelowValue->text().toFloat(),
+ getLyXLength(spacingBelowValueUnit->currentItem())),
+ LyXLength(spacingBelowPlus->text().toFloat(),
+ getLyXLength(spacingBelowPlusUnit->currentItem())),
+ LyXLength(spacingBelowMinus->text().toFloat(),
+ getLyXLength(spacingBelowMinusUnit->currentItem()))
);
return len;
}
#include "vspace.h"
#include "paragraph.h"
#include "layout.h"
+#include "lyxgluelength.h"
class QParagraph;
void setAlign(int);
void setChecks(bool, bool, bool, bool, bool);
void setSpace(VSpace::vspace_kind, VSpace::vspace_kind, bool, bool);
- void setAboveLength(float, float, float, LyXGlueLength::UNIT, LyXGlueLength::UNIT, LyXGlueLength::UNIT);
- void setBelowLength(float, float, float, LyXGlueLength::UNIT, LyXGlueLength::UNIT, LyXGlueLength::UNIT);
- void setExtra(float, LyXGlueLength::UNIT, const string, int, bool, bool, Paragraph::PEXTRA_TYPE);
+ void setAboveLength(float, float, float, LyXLength::UNIT, LyXLength::UNIT, LyXLength::UNIT);
+ void setBelowLength(float, float, float, LyXLength::UNIT, LyXLength::UNIT, LyXLength::UNIT);
+ void setExtra(float, LyXLength::UNIT, const string, int, bool, bool, Paragraph::PEXTRA_TYPE);
LyXGlueLength getAboveLength() const;
LyXGlueLength getBelowLength() const;
LyXLength getExtraWidth() const;
}
-void QTocDialog::depth_adaptor(int depth)
+void QTocDialog::depth_adaptor(int /*depth*/)
{
//form_->set_depth(depth);
}
-void QTocDialog::select_adaptor(QListViewItem * item)
+void QTocDialog::select_adaptor(QListViewItem * /*item*/)
{
//form_->select(item->text(0));
}