anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-21 07:12:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add warning make controllers compile and remove some alomost unused functions, comment out usage by undo

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7004 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2003-05-22 16:10:34 +00:00
parent 0062cd3408
commit 62be565337
5 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/controllers/ViewBase.h
View File

@ -15,6 +15,8 @@
class ControlButtons;
class ButtonController;
#include "LString.h"
#include <boost/utility.hpp>
class ViewBase : boost::noncopyable {

2
src/insets/ChangeLog
View File

@ -4,6 +4,8 @@
2003-05-22 Lars Gullik Bjønnes <larsbj@gullik.net>
* insettext.[Ch] (paragraph): delete unused function
* insetfloat.C (addToToc): parlist simplfication
2003-05-20 Jürgen Spitzmüller <j.spitzmueller@gmx.de>

18
src/insets/insettext.C
View File

@ -2346,24 +2346,6 @@ LyXCursor const & InsetText::cursor(BufferView * bv) const
}
void InsetText::paragraph(Paragraph * p)
{
// GENERAL COMMENT: We don't have to free the old paragraphs as the
// caller of this function has to take care of it. This IS important
// as we could have to insert a paragraph before this one and just
// link the actual to a new ones next and set it with this function
// and are done!
paragraphs.set(p);
// set ourself as owner for all the paragraphs inserted!
for_each(paragraphs.begin(), paragraphs.end(),
boost::bind(&Paragraph::setInsetOwner, _1, this));
reinitLyXText();
// redraw myself when asked for
need_update = INIT;
}
Inset * InsetText::getInsetFromID(int id_arg) const
{
if (id_arg == id())

2
src/insets/insettext.h
View File

@ -196,8 +196,6 @@ public:
///
LyXCursor const & cursor(BufferView *) const;
///
void paragraph(Paragraph *);
///
bool allowSpellcheck() const { return true; }
///
WordLangTuple const

20
src/undo_funcs.C
View File

@ -98,7 +98,7 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
t->setCursorIntern(undoParagraphs(bv, num).begin(), 0);
}
// Set the right(new) inset-owner of the paragraph if there is any.
// Set the right(new) inset-owner of the paragraph if there is any.
if (!undo.pars.empty()) {
Inset * in = 0;
if (before != end)
@ -123,7 +123,7 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
}
// this surprisingly fills the undo! (Andre')
size_t par = 0;
//while (deletepar && deletepar != *behind)
//while (deletepar && deletepar != *behind)
while (deletepar != *behind) {
deletelist.push_back(&*deletepar);
++deletepar;
@ -160,9 +160,11 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
int id = undoParagraphs(bv, undo.number_of_inset_id).front().id();
ParIterator op = bv->buffer()->getParFromID(id);
if (op != end && op->inInset()) {
static_cast<InsetText*>(op->inInset())->paragraph(undopar);
#warning FIXME reimplementaion needed here
//static_cast<InsetText*>(op->inInset())->paragraph(undopar);
} else {
bv->buffer()->paragraphs.set(undopar);
#warning FIXME reimplementation needed here
//bv->buffer()->paragraphs.set(undopar);
}
}
} else {
@ -173,9 +175,11 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
int id = undoParagraphs(bv, undo.number_of_inset_id).front().id();
ParIterator op = bv->buffer()->getParFromID(id);
if (op != end && op->inInset()) {
static_cast<InsetText*>(op->inInset())->paragraph(&**behind);
#warning FIXME reimplementation needed here
//static_cast<InsetText*>(op->inInset())->paragraph(&**behind);
} else {
bv->buffer()->paragraphs.set(&**behind);
#warning FIXME reimplementation needed here
//bv->buffer()->paragraphs.set(&**behind);
}
undopar = &**behind;
}
@ -336,12 +340,12 @@ bool createUndo(BufferView * bv, Undo::undo_kind kind,
if (kind == Undo::EDIT) {
for (size_t i = 0, n = undo_pars.size(); i < n; ++i)
undo_pars[i]->clearContents();
}
}
int cursor_par = undoCursor(bv).par()->id();
int cursor_pos = undoCursor(bv).pos();
//lyxerr << "createUndo: inset_id: " << inset_id << " before_number: "
//lyxerr << "createUndo: inset_id: " << inset_id << " before_number: "
// << before_number << " behind_number: " << behind_number << "\n";
u.reset(new Undo(kind, inset_id,
before_number, behind_number,