mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
Compare commits
3 Commits
52157c9318
...
928f9514a8
Author | SHA1 | Date | |
---|---|---|---|
|
928f9514a8 | ||
|
8c76a9fc3d | ||
|
980f91d12e |
@ -126,7 +126,7 @@ static bool isFullyDeleted(ParagraphList const & pars)
|
|||||||
|
|
||||||
PasteReturnValue
|
PasteReturnValue
|
||||||
pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
|
pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
|
||||||
DocumentClassConstPtr oldDocClass, cap::BranchAction branchAction,
|
DocumentClassConstPtr const & oldDocClass, cap::BranchAction branchAction,
|
||||||
ErrorList & errorlist)
|
ErrorList & errorlist)
|
||||||
{
|
{
|
||||||
Buffer const & buffer = *cur.buffer();
|
Buffer const & buffer = *cur.buffer();
|
||||||
@ -229,7 +229,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
|
|||||||
}
|
}
|
||||||
|
|
||||||
// set the paragraphs to plain layout if necessary
|
// set the paragraphs to plain layout if necessary
|
||||||
DocumentClassConstPtr newDocClass = buffer.params().documentClassPtr();
|
DocumentClassConstPtr const & newDocClass = buffer.params().documentClassPtr();
|
||||||
Layout const & plainLayout = newDocClass->plainLayout();
|
Layout const & plainLayout = newDocClass->plainLayout();
|
||||||
Layout const & defaultLayout = newDocClass->defaultLayout();
|
Layout const & defaultLayout = newDocClass->defaultLayout();
|
||||||
if (cur.inset().usePlainLayout()) {
|
if (cur.inset().usePlainLayout()) {
|
||||||
@ -699,7 +699,7 @@ void putClipboard(ParagraphList const & paragraphs,
|
|||||||
|
|
||||||
void copySelectionHelper(Buffer const & buf, Text const & text,
|
void copySelectionHelper(Buffer const & buf, Text const & text,
|
||||||
pit_type startpit, pit_type endpit,
|
pit_type startpit, pit_type endpit,
|
||||||
int start, int end, DocumentClassConstPtr dc, CutStack & cutstack)
|
int start, int end, DocumentClassConstPtr const & dc, CutStack & cutstack)
|
||||||
{
|
{
|
||||||
ParagraphList const & pars = text.paragraphs();
|
ParagraphList const & pars = text.paragraphs();
|
||||||
|
|
||||||
@ -1245,14 +1245,14 @@ docstring selection(size_t sel_index, DocInfoPair docinfo, bool for_math)
|
|||||||
|
|
||||||
|
|
||||||
void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
|
void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
|
||||||
DocumentClassConstPtr docclass, AuthorList const & authors,
|
DocumentClassConstPtr const & docclass, AuthorList const & authors,
|
||||||
ErrorList & errorList,
|
ErrorList & errorList,
|
||||||
cap::BranchAction branchAction)
|
cap::BranchAction branchAction)
|
||||||
{
|
{
|
||||||
// Copy authors to the params. We need those pointers.
|
// Copy authors to the params. We need those pointers.
|
||||||
for (Author const & a : authors)
|
for (Author const & a : authors)
|
||||||
cur.buffer()->params().authors().record(a);
|
cur.buffer()->params().authors().record(a);
|
||||||
|
|
||||||
if (cur.inTexted()) {
|
if (cur.inTexted()) {
|
||||||
Text * text = cur.text();
|
Text * text = cur.text();
|
||||||
LBUFERR(text);
|
LBUFERR(text);
|
||||||
|
@ -128,7 +128,7 @@ enum BranchAction {
|
|||||||
/// Paste the paragraph list \p parlist at the position given by \p cur.
|
/// Paste the paragraph list \p parlist at the position given by \p cur.
|
||||||
/// Does not handle undo. Does only work in text, not mathed.
|
/// Does not handle undo. Does only work in text, not mathed.
|
||||||
void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
|
void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
|
||||||
DocumentClassConstPtr textclass, AuthorList const & authors,
|
DocumentClassConstPtr const & textclass, AuthorList const & authors,
|
||||||
ErrorList & errorList,
|
ErrorList & errorList,
|
||||||
BranchAction branchAction = BRANCH_ASK);
|
BranchAction branchAction = BRANCH_ASK);
|
||||||
|
|
||||||
|
@ -744,7 +744,7 @@ class SocketNotifier : public QSocketNotifier
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
/// connect a connection notification from the LyXServerSocket
|
/// connect a connection notification from the LyXServerSocket
|
||||||
SocketNotifier(QObject * parent, int fd, Application::SocketCallback func)
|
SocketNotifier(QObject * parent, int fd, Application::SocketCallback const & func)
|
||||||
: QSocketNotifier(fd, QSocketNotifier::Read, parent), func_(func)
|
: QSocketNotifier(fd, QSocketNotifier::Read, parent), func_(func)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
@ -290,7 +290,7 @@ int ForkedCall::startScript(Starttype wait, string const & what)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int ForkedCall::startScript(string const & what, sigPtr signal)
|
int ForkedCall::startScript(string const & what, sigPtr const & signal)
|
||||||
{
|
{
|
||||||
command_ = commandPrep(trim(what));
|
command_ = commandPrep(trim(what));
|
||||||
signal_ = signal;
|
signal_ = signal;
|
||||||
|
@ -177,7 +177,7 @@ public:
|
|||||||
int startScript(Starttype, std::string const & what);
|
int startScript(Starttype, std::string const & what);
|
||||||
|
|
||||||
///
|
///
|
||||||
int startScript(std::string const & what, sigPtr ptr);
|
int startScript(std::string const & what, sigPtr const & ptr);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
///
|
///
|
||||||
|
Loading…
Reference in New Issue
Block a user