mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-09-19 22:40:26 +00:00
Replace boost::tuple with std::tuple
This commit is contained in:
parent
b032e2dfaf
commit
b95b77c631
1
3rdparty/boost/extract.sh
vendored
1
3rdparty/boost/extract.sh
vendored
@ -29,7 +29,6 @@ bcp --boost=$1 \
|
|||||||
boost/signal.hpp \
|
boost/signal.hpp \
|
||||||
boost/signals/connection.hpp \
|
boost/signals/connection.hpp \
|
||||||
boost/signals/trackable.hpp \
|
boost/signals/trackable.hpp \
|
||||||
boost/tuple/tuple.hpp \
|
|
||||||
\
|
\
|
||||||
needed
|
needed
|
||||||
|
|
||||||
|
@ -68,9 +68,8 @@
|
|||||||
#include "frontends/Clipboard.h"
|
#include "frontends/Clipboard.h"
|
||||||
#include "frontends/Selection.h"
|
#include "frontends/Selection.h"
|
||||||
|
|
||||||
#include <boost/tuple/tuple.hpp>
|
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <tuple>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using namespace lyx::support;
|
using namespace lyx::support;
|
||||||
@ -876,11 +875,9 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut)
|
|||||||
if (begpit != endpit)
|
if (begpit != endpit)
|
||||||
cur.screenUpdateFlags(Update::Force | Update::FitCursor);
|
cur.screenUpdateFlags(Update::Force | Update::FitCursor);
|
||||||
|
|
||||||
boost::tie(endpit, endpos) =
|
tie(endpit, endpos) =
|
||||||
eraseSelectionHelper(bp,
|
eraseSelectionHelper(bp, text->paragraphs(), begpit, endpit,
|
||||||
text->paragraphs(),
|
cur.selBegin().pos(), endpos);
|
||||||
begpit, endpit,
|
|
||||||
cur.selBegin().pos(), endpos);
|
|
||||||
|
|
||||||
// cutSelection can invalidate the cursor so we need to set
|
// cutSelection can invalidate the cursor so we need to set
|
||||||
// it anew. (Lgb)
|
// it anew. (Lgb)
|
||||||
|
@ -84,10 +84,9 @@ TODO
|
|||||||
#include "support/os.h"
|
#include "support/os.h"
|
||||||
#include "support/Systemcall.h"
|
#include "support/Systemcall.h"
|
||||||
|
|
||||||
#include <boost/tuple/tuple.hpp>
|
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
#include <tuple>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using namespace lyx::support;
|
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.
|
// we move it to a temp dir or uncompress it.
|
||||||
FileName temp_file;
|
FileName temp_file;
|
||||||
GraphicsCopyStatus status;
|
GraphicsCopyStatus status;
|
||||||
boost::tie(status, temp_file) =
|
tie(status, temp_file) = copyToDirIfNeeded(params().filename, temp_path);
|
||||||
copyToDirIfNeeded(params().filename, temp_path);
|
|
||||||
|
|
||||||
if (status == FAILURE)
|
if (status == FAILURE)
|
||||||
return orig_file;
|
return orig_file;
|
||||||
@ -891,8 +889,7 @@ string InsetGraphics::prepareHTMLFile(OutputParams const & runparams) const
|
|||||||
// Copy to temporary directory.
|
// Copy to temporary directory.
|
||||||
FileName temp_file;
|
FileName temp_file;
|
||||||
GraphicsCopyStatus status;
|
GraphicsCopyStatus status;
|
||||||
boost::tie(status, temp_file) =
|
tie(status, temp_file) = copyToDirIfNeeded(params().filename, temp_path);
|
||||||
copyToDirIfNeeded(params().filename, temp_path);
|
|
||||||
|
|
||||||
if (status == FAILURE)
|
if (status == FAILURE)
|
||||||
return string();
|
return string();
|
||||||
|
Loading…
Reference in New Issue
Block a user