From 78caccb1c595e5c0b5f3bb2626ef9410b02fe1e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Thu, 13 Dec 2007 21:57:37 +0000 Subject: [PATCH] cmake/merge: fix compile, this split conflicts with the others git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22137 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/FuncRequest.cpp | 4 ++-- src/factory.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp index 9f1405ddc4..d14503fefd 100644 --- a/src/FuncRequest.cpp +++ b/src/FuncRequest.cpp @@ -70,7 +70,7 @@ mouse_button::state FuncRequest::button() const } -void split(vector & args, string const & str) +void splitArg(vector & args, string const & str) { istringstream is(str); while (is) { @@ -93,7 +93,7 @@ void split(vector & args, string const & str) string FuncRequest::getArg(unsigned int i) const { vector args; - split(args, to_utf8(argument_)); + splitArg(args, to_utf8(argument_)); return i < args.size() ? args[i] : string(); } diff --git a/src/factory.cpp b/src/factory.cpp index d5c1ddd1f6..71c92ac311 100644 --- a/src/factory.cpp +++ b/src/factory.cpp @@ -363,7 +363,7 @@ Inset * createInset(Buffer & buf, FuncRequest const & cmd) if (message.type_ == ErrorException) { Alert::error(message.title_, message.details_); LyX::cref().emergencyCleanup(); - abort(); + support::abort(); } else if (message.type_ == WarningException) { Alert::warning(message.title_, message.details_); return 0; -- 2.39.5