anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-31 15:46:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix compiler warnings (bug 1927)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10465 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2005-09-20 08:31:37 +00:00
parent 0b7c8e8678
commit 81efcd9cf6
10 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ChangeLog
View File

@ -2,6 +2,15 @@
* rowpainter.C (paintText): fix RtL space width display bug (2029)
2005-09-19 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* text2.C (setCursor): remove the unused 'boundary' parameter for
the CursorSlice version; adapt the LCursor version.
* lyxrc.C (write):
* paragraph_pimpl.C (markErased):
* cursor.C (bruteFind2, bruteFond3): fix warnings.
2005-09-19 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* rowpainter.C (paintFirst): use a 'labeladdon' for TOP_* labels,

4
src/cursor.C
View File

@ -94,7 +94,7 @@ namespace {
it.top().pos() = 0;
DocIterator et = c;
et.top().pos() = et.top().asMathInset()->cell(et.top().idx()).size();
for (int i = 0; ; ++i) {
for (size_t i = 0; ; ++i) {
int xo;
int yo;
it.inset().cursorPos(it.top(), c.boundary() && ((i+1) == it.depth()), xo, yo);
@ -170,7 +170,7 @@ namespace {
// FIXME: bit more work needed to get 'from' and 'to' right.
pit_type from = cur.bottom().pit();
pit_type to = cur.bottom().pit();
//pit_type to = cur.bottom().pit();
//lyxerr << "Pit start: " << from << endl;
//lyxerr << "bruteFind3: x: " << x << " y: " << y

4
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,7 @@
2005-09-19 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* QGraphics.C (update_contents): fix compiler warning.
2005-09-15 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* QCitationDialog.C (find): correct start iterator when searching

9
src/frontends/qt2/QGraphics.C
View File

@ -156,19 +156,12 @@ void QGraphics::update_contents()
// set the right default unit
LyXLength::UNIT unitDefault = LyXLength::CM;
switch (lyxrc.default_papersize) {
case PAPER_DEFAULT: break;
case PAPER_USLETTER:
case PAPER_USLEGAL:
case PAPER_USEXECUTIVE:
unitDefault = LyXLength::IN;
break;
case PAPER_A3:
case PAPER_A4:
case PAPER_A5:
case PAPER_B5:
unitDefault = LyXLength::CM;
default:
break;
}

5
src/lyxrc.C
View File

@ -1311,7 +1311,10 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
os << "a5"; break;
case PAPER_B5:
os << "b5"; break;
case PAPER_DEFAULT: break;
case PAPER_DEFAULT:
case PAPER_CUSTOM:
case PAPER_B3:
case PAPER_B4: break;
}
os << "\"\n";
}

3
src/lyxtext.h
View File

@ -165,8 +165,7 @@ public:
bool setCursor(LCursor & cur, pit_type par, pos_type pos,
bool setfont = true, bool boundary = false);
///
void setCursor(CursorSlice &, pit_type par,
pos_type pos, bool boundary = false);
void setCursor(CursorSlice &, pit_type par, pos_type pos);
///
void setCursorIntern(LCursor & cur, pit_type par,
pos_type pos, bool setfont = true, bool boundary = false);

4
src/mathed/ChangeLog
View File

@ -1,3 +1,7 @@
2005-09-19 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* math_nestinset.C (cursorPos): parameter `boundary' is unused.
2005-09-15 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* math_nestinset.C (doDispatch): use cur.normalize() to prevent crash

2
src/mathed/math_nestinset.C
View File

@ -88,7 +88,7 @@ MathArray const & MathNestInset::cell(idx_type i) const
}
void MathNestInset::cursorPos(CursorSlice const & sl, bool boundary,
void MathNestInset::cursorPos(CursorSlice const & sl, bool /*boundary*/,
int & x, int & y) const
{
// FIXME: This is a hack. Ideally, the coord cache should not store

2
src/paragraph_pimpl.C
View File

@ -172,8 +172,6 @@ void Paragraph::Pimpl::markErased(bool erased)
if (erased) {
erase(0, size());
} else {
pos_type i = 0;
for (pos_type i = 0; i < size(); ++i) {
changes_->set(Change::UNCHANGED, i);
if (owner_->isInset(i))

5
src/text2.C
View File

@ -667,8 +667,7 @@ bool LyXText::setCursor(LCursor & cur, pit_type par, pos_type pos,
}
void LyXText::setCursor(CursorSlice & cur, pit_type par,
pos_type pos, bool boundary)
void LyXText::setCursor(CursorSlice & cur, pit_type par, pos_type pos)
{
BOOST_ASSERT(par != int(paragraphs().size()));
cur.pit() = par;
@ -696,7 +695,7 @@ void LyXText::setCursorIntern(LCursor & cur,
pit_type par, pos_type pos, bool setfont, bool boundary)
{
cur.boundary(boundary);
setCursor(cur.top(), par, pos, boundary);
setCursor(cur.top(), par, pos);
cur.setTargetX();
if (setfont)
setCurrentFont(cur);