anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 19:25:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

compile fixes

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3155 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2001-12-05 18:32:49 +00:00
parent e71bea78ca
commit a605db8120
6 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,11 @@
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> 2001-12-05 Lars Gullik Bjønnes <larsbj@birdstep.com>
* qttableview.C: change "while(" to "while (" * qttableview.C: change "while(" to "while ("

4
src/frontends/qt2/QIndex.C
View File

@ -37,13 +37,13 @@ void QIndex::build_dialog()
void QIndex::update_contents() void QIndex::update_contents()
{ {
dialog_->keywordED->setText(controller().getContents().c_str()); dialog_->keywordED->setText(controller().params().getContents().c_str());
} }
void QIndex::apply() void QIndex::apply()
{ {
controller().setContents(dialog_->keywordED->text().latin1()); controller().params().setContents(dialog_->keywordED->text().latin1());
} }

8
src/frontends/qt2/QParagraph.C
View File

@ -69,16 +69,16 @@ void QParagraph::update(bool switched)
if (params->spaceTop().kind() == VSpace::LENGTH) { if (params->spaceTop().kind() == VSpace::LENGTH) {
LyXGlueLength above = params->spaceTop().length(); LyXGlueLength above = params->spaceTop().length();
lyxerr[Debug::GUI] << "Reading above space : \"" << params->spaceTop().length().asString() << "\"" << endl; lyxerr[Debug::GUI] << "Reading above space : \"" << params->spaceTop().length().asString() << "\"" << endl;
dialog_->setAboveLength(above.value(), above.plusValue(), above.minusValue(), dialog_->setAboveLength(above.len().value(), above.plus().value(), above.minus().value(),
above.unit(), above.plusUnit(), above.minusUnit()); above.len().unit(), above.plus().unit(), above.minus().unit());
} else } else
dialog_->setAboveLength(0.0, 0.0, 0.0, LyXLength::UNIT_NONE, LyXLength::UNIT_NONE, LyXLength::UNIT_NONE); dialog_->setAboveLength(0.0, 0.0, 0.0, LyXLength::UNIT_NONE, LyXLength::UNIT_NONE, LyXLength::UNIT_NONE);
if (params->spaceBottom().kind() == VSpace::LENGTH) { if (params->spaceBottom().kind() == VSpace::LENGTH) {
LyXGlueLength below = params->spaceBottom().length(); LyXGlueLength below = params->spaceBottom().length();
lyxerr[Debug::GUI] << "Reading below space : \"" << params->spaceBottom().length().asString() << "\"" << endl; lyxerr[Debug::GUI] << "Reading below space : \"" << params->spaceBottom().length().asString() << "\"" << endl;
dialog_->setBelowLength(below.value(), below.plusValue(), below.minusValue(), dialog_->setBelowLength(below.len().value(), below.plus().value(), below.minus().value(),
below.unit(), below.plusUnit(), below.minusUnit()); below.len().unit(), below.plus().unit(), below.minus().unit());
} else } else
dialog_->setBelowLength(0.0, 0.0, 0.0, LyXLength::UNIT_NONE, LyXLength::UNIT_NONE, LyXLength::UNIT_NONE); dialog_->setBelowLength(0.0, 0.0, 0.0, LyXLength::UNIT_NONE, LyXLength::UNIT_NONE, LyXLength::UNIT_NONE);

24
src/frontends/qt2/QParagraphDialog.C
View File

@ -218,12 +218,12 @@ void QParagraphDialog::setExtra(float widthval, LyXLength::UNIT units, const str
LyXGlueLength QParagraphDialog::getAboveLength() const LyXGlueLength QParagraphDialog::getAboveLength() const
{ {
LyXGlueLength len( LyXGlueLength len(
spacingAboveValue->text().toFloat(), LyXLength(spacingAboveValue->text().toFloat(),
getLyXLength( spacingAboveValueUnit->currentItem() ), getLyXLength(spacingAboveValueUnit->currentItem())),
spacingAbovePlus->text().toFloat(), LyXLength(spacingAbovePlus->text().toFloat(),
getLyXLength( spacingAbovePlusUnit->currentItem() ), getLyXLength(spacingAbovePlusUnit->currentItem())),
spacingAboveMinus->text().toFloat(), LyXLength(spacingAboveMinus->text().toFloat(),
getLyXLength( spacingAboveMinusUnit->currentItem() ) getLyXLength(spacingAboveMinusUnit->currentItem()))
); );
return len; return len;
} }
@ -232,12 +232,12 @@ LyXGlueLength QParagraphDialog::getAboveLength() const
LyXGlueLength QParagraphDialog::getBelowLength() const LyXGlueLength QParagraphDialog::getBelowLength() const
{ {
LyXGlueLength len( LyXGlueLength len(
spacingBelowValue->text().toFloat(), LyXLength(spacingBelowValue->text().toFloat(),
getLyXLength( spacingBelowValueUnit->currentItem() ), getLyXLength(spacingBelowValueUnit->currentItem())),
spacingBelowPlus->text().toFloat(), LyXLength(spacingBelowPlus->text().toFloat(),
getLyXLength( spacingBelowPlusUnit->currentItem() ), getLyXLength(spacingBelowPlusUnit->currentItem())),
spacingBelowMinus->text().toFloat(), LyXLength(spacingBelowMinus->text().toFloat(),
getLyXLength( spacingBelowMinusUnit->currentItem() ) getLyXLength(spacingBelowMinusUnit->currentItem()))
); );
return len; return len;
} }

7
src/frontends/qt2/QParagraphDialog.h
View File

@ -16,6 +16,7 @@
#include "vspace.h" #include "vspace.h"
#include "paragraph.h" #include "paragraph.h"
#include "layout.h" #include "layout.h"
#include "lyxgluelength.h"
class QParagraph; class QParagraph;
@ -32,9 +33,9 @@ public:
void setAlign(int); void setAlign(int);
void setChecks(bool, bool, bool, bool, bool); void setChecks(bool, bool, bool, bool, bool);
void setSpace(VSpace::vspace_kind, VSpace::vspace_kind, bool, bool); void setSpace(VSpace::vspace_kind, VSpace::vspace_kind, bool, bool);
void setAboveLength(float, float, float, LyXGlueLength::UNIT, LyXGlueLength::UNIT, LyXGlueLength::UNIT); void setAboveLength(float, float, float, LyXLength::UNIT, LyXLength::UNIT, LyXLength::UNIT);
void setBelowLength(float, float, float, LyXGlueLength::UNIT, LyXGlueLength::UNIT, LyXGlueLength::UNIT); void setBelowLength(float, float, float, LyXLength::UNIT, LyXLength::UNIT, LyXLength::UNIT);
void setExtra(float, LyXGlueLength::UNIT, const string, int, bool, bool, Paragraph::PEXTRA_TYPE); void setExtra(float, LyXLength::UNIT, const string, int, bool, bool, Paragraph::PEXTRA_TYPE);
LyXGlueLength getAboveLength() const; LyXGlueLength getAboveLength() const;
LyXGlueLength getBelowLength() const; LyXGlueLength getBelowLength() const;
LyXLength getExtraWidth() const; LyXLength getExtraWidth() const;

4
src/frontends/qt2/QTocDialog.C
View File

@ -54,13 +54,13 @@ void QTocDialog::close_adaptor()
} }
void QTocDialog::depth_adaptor(int depth) void QTocDialog::depth_adaptor(int /*depth*/)
{ {
//form_->set_depth(depth); //form_->set_depth(depth);
} }
void QTocDialog::select_adaptor(QListViewItem * item) void QTocDialog::select_adaptor(QListViewItem * /*item*/)
{ {
//form_->select(item->text(0)); //form_->select(item->text(0));
} }