anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 14:30:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace boost::tuple with std::tuple

Browse Source
This commit is contained in:
Guillaume Munch 2016-06-02 20:06:59 +01:00
parent b032e2dfaf
commit b95b77c631
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdparty/boost/extract.sh vendored
View File

@ -29,7 +29,6 @@ bcp --boost=$1 \
boost/signal.hpp \
boost/signals/connection.hpp \
boost/signals/trackable.hpp \
boost/tuple/tuple.hpp \
\
needed

11
src/CutAndPaste.cpp
View File

@ -68,9 +68,8 @@
#include "frontends/Clipboard.h"
#include "frontends/Selection.h"
#include <boost/tuple/tuple.hpp>
#include <string>
#include <tuple>
using namespace std;
using namespace lyx::support;
@ -876,11 +875,9 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut)
if (begpit != endpit)
cur.screenUpdateFlags(Update::Force | Update::FitCursor);
boost::tie(endpit, endpos) =
eraseSelectionHelper(bp,
text->paragraphs(),
begpit, endpit,
cur.selBegin().pos(), endpos);
tie(endpit, endpos) =
eraseSelectionHelper(bp, text->paragraphs(), begpit, endpit,
cur.selBegin().pos(), endpos);
// cutSelection can invalidate the cursor so we need to set
// it anew. (Lgb)

9
src/insets/InsetGraphics.cpp
View File

@ -84,10 +84,9 @@ TODO
#include "support/os.h"
#include "support/Systemcall.h"
#include <boost/tuple/tuple.hpp>
#include <algorithm>
#include <sstream>
#include <tuple>
using namespace std;
using namespace lyx::support;
@ -595,8 +594,7 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const
// we move it to a temp dir or uncompress it.
FileName temp_file;
GraphicsCopyStatus status;
boost::tie(status, temp_file) =
copyToDirIfNeeded(params().filename, temp_path);
tie(status, temp_file) = copyToDirIfNeeded(params().filename, temp_path);
if (status == FAILURE)
return orig_file;
@ -891,8 +889,7 @@ string InsetGraphics::prepareHTMLFile(OutputParams const & runparams) const
// Copy to temporary directory.
FileName temp_file;
GraphicsCopyStatus status;
boost::tie(status, temp_file) =
copyToDirIfNeeded(params().filename, temp_path);
tie(status, temp_file) = copyToDirIfNeeded(params().filename, temp_path);
if (status == FAILURE)
return string();