diff -up scantailor-0.9.11.1/filters/deskew/Filter.cpp.boost scantailor-0.9.11.1/filters/deskew/Filter.cpp
--- scantailor-0.9.11.1/filters/deskew/Filter.cpp.boost 2012-02-27 21:21:08.000000000 +0100
+++ scantailor-0.9.11.1/filters/deskew/Filter.cpp 2016-04-14 13:16:02.976858653 +0200
@@ -83,9 +83,9 @@ Filter::saveSettings(ProjectWriter const
QDomElement filter_el(doc.createElement("deskew"));
writer.enumPages(
- bind(
+ boost::lambda::bind(
&Filter::writePageSettings,
- this, boost::ref(doc), var(filter_el), _1, _2
+ this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2
)
);
diff -up scantailor-0.9.11.1/filters/fix_orientation/Filter.cpp.boost scantailor-0.9.11.1/filters/fix_orientation/Filter.cpp
--- scantailor-0.9.11.1/filters/fix_orientation/Filter.cpp.boost 2012-02-27 21:21:08.000000000 +0100
+++ scantailor-0.9.11.1/filters/fix_orientation/Filter.cpp 2016-04-14 13:16:02.976858653 +0200
@@ -98,9 +98,9 @@ Filter::saveSettings(
QDomElement filter_el(doc.createElement("fix-orientation"));
writer.enumImages(
- bind(
+ boost::lambda::bind(
&Filter::writeImageSettings,
- this, boost::ref(doc), var(filter_el), _1, _2
+ this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2
)
);
diff -up scantailor-0.9.11.1/filters/output/Filter.cpp.boost scantailor-0.9.11.1/filters/output/Filter.cpp
--- scantailor-0.9.11.1/filters/output/Filter.cpp.boost 2012-02-27 21:21:08.000000000 +0100
+++ scantailor-0.9.11.1/filters/output/Filter.cpp 2016-04-14 13:16:02.976858653 +0200
@@ -91,9 +91,9 @@ Filter::saveSettings(
QDomElement filter_el(doc.createElement("output"));
writer.enumPages(
- bind(
+ boost::lambda::bind(
&Filter::writePageSettings,
- this, boost::ref(doc), var(filter_el), _1, _2
+ this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2
)
);
diff -up scantailor-0.9.11.1/filters/page_layout/Filter.cpp.boost scantailor-0.9.11.1/filters/page_layout/Filter.cpp
--- scantailor-0.9.11.1/filters/page_layout/Filter.cpp.boost 2012-02-27 21:21:08.000000000 +0100
+++ scantailor-0.9.11.1/filters/page_layout/Filter.cpp 2016-04-14 13:16:02.976858653 +0200
@@ -134,9 +134,9 @@ Filter::saveSettings(
QDomElement filter_el(doc.createElement("page-layout"));
writer.enumPages(
- bind(
+ boost::lambda::bind(
&Filter::writePageSettings,
- this, boost::ref(doc), var(filter_el), _1, _2
+ this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2
)
);
diff -up scantailor-0.9.11.1/filters/page_split/Filter.cpp.boost scantailor-0.9.11.1/filters/page_split/Filter.cpp
--- scantailor-0.9.11.1/filters/page_split/Filter.cpp.boost 2012-02-27 21:21:08.000000000 +0100
+++ scantailor-0.9.11.1/filters/page_split/Filter.cpp 2016-04-14 13:16:02.976858653 +0200
@@ -108,9 +108,9 @@ Filter::saveSettings(
);
writer.enumImages(
- bind(
+ boost::lambda::bind(
&Filter::writeImageSettings,
- this, boost::ref(doc), var(filter_el), _1, _2
+ this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2
)
);
diff -up scantailor-0.9.11.1/filters/page_split/PageLayoutEstimator.cpp.boost scantailor-0.9.11.1/filters/page_split/PageLayoutEstimator.cpp
diff -up scantailor-0.9.11.1/filters/select_content/Filter.cpp.boost scantailor-0.9.11.1/filters/select_content/Filter.cpp
--- scantailor-0.9.11.1/filters/select_content/Filter.cpp.boost 2012-02-27 21:21:08.000000000 +0100
+++ scantailor-0.9.11.1/filters/select_content/Filter.cpp 2016-04-14 13:16:02.977858652 +0200
@@ -117,9 +117,9 @@ Filter::saveSettings(
QDomElement filter_el(doc.createElement("select-content"));
writer.enumPages(
- bind(
+ boost::lambda::bind(
&Filter::writePageSettings,
- this, boost::ref(doc), var(filter_el), _1, _2
+ this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2
)
);
diff -up scantailor-0.9.11.1/FixDpiDialog.cpp.boost scantailor-0.9.11.1/FixDpiDialog.cpp
--- scantailor-0.9.11.1/FixDpiDialog.cpp.boost 2012-02-27 21:21:08.000000000 +0100
+++ scantailor-0.9.11.1/FixDpiDialog.cpp 2016-04-14 13:16:02.977858652 +0200
@@ -843,7 +843,7 @@ FixDpiDialog::TreeModel::sizeGroupFor(QS
std::vector<SizeGroup>::iterator const it(
std::find_if(
m_sizes.begin(), m_sizes.end(),
- bind(&SizeGroup::size, _1) == size
+ boost::lambda::bind(&SizeGroup::size, boost::lambda::_1) == size
)
);
if (it != m_sizes.end()) {
diff -up scantailor-0.9.11.1/ImageFileInfo.cpp.boost scantailor-0.9.11.1/ImageFileInfo.cpp
--- scantailor-0.9.11.1/ImageFileInfo.cpp.boost 2012-02-27 21:21:08.000000000 +0100
+++ scantailor-0.9.11.1/ImageFileInfo.cpp 2016-04-14 13:16:02.977858652 +0200
@@ -28,7 +28,7 @@ ImageFileInfo::isDpiOK() const
return std::find_if(
m_imageInfo.begin(), m_imageInfo.end(),
- !bind(&ImageMetadata::isDpiOK, _1)
+ !boost::lambda::bind(&ImageMetadata::isDpiOK, boost::lambda::_1)
) == m_imageInfo.end();
}
diff -up scantailor-0.9.11.1/MainWindow.cpp.boost scantailor-0.9.11.1/MainWindow.cpp
--- scantailor-0.9.11.1/MainWindow.cpp.boost 2012-02-27 21:21:08.000000000 +0100
+++ scantailor-0.9.11.1/MainWindow.cpp 2016-04-14 13:16:02.978858651 +0200
@@ -1896,8 +1896,8 @@ MainWindow::showInsertFileDialog(BeforeO
ImageFileInfo image_file_info(file_info, std::vector<ImageMetadata>());
ImageMetadataLoader::Status const status = ImageMetadataLoader::load(
- files.at(i), bind(&std::vector<ImageMetadata>::push_back,
- boost::ref(image_file_info.imageInfo()), _1)
+ files.at(i), boost::lambda::bind(&std::vector<ImageMetadata>::push_back,
+ boost::ref(image_file_info.imageInfo()), boost::lambda::_1)
);
if (status == ImageMetadataLoader::LOADED) {
@@ -1919,7 +1919,7 @@ MainWindow::showInsertFileDialog(BeforeO
}
// Check if there is at least one DPI that's not OK.
- if (std::find_if(new_files.begin(), new_files.end(), !bind(&ImageFileInfo::isDpiOK, _1)) != new_files.end()) {
+ if (std::find_if(new_files.begin(), new_files.end(), !boost::lambda::bind(&ImageFileInfo::isDpiOK, boost::lambda::_1)) != new_files.end()) {
std::auto_ptr<FixDpiDialog> dpi_dialog(new FixDpiDialog(new_files, this));
dpi_dialog->setWindowModality(Qt::WindowModal);
diff -up scantailor-0.9.11.1/ProjectCreationContext.cpp.boost scantailor-0.9.11.1/ProjectCreationContext.cpp
--- scantailor-0.9.11.1/ProjectCreationContext.cpp.boost 2012-02-27 21:21:08.000000000 +0100
+++ scantailor-0.9.11.1/ProjectCreationContext.cpp 2016-04-14 13:16:02.978858651 +0200
@@ -51,7 +51,7 @@ bool allDpisOK(T const& container)
return std::find_if(
container.begin(), container.end(),
- !bind(&ImageFileInfo::isDpiOK, _1)
+ !boost::lambda::bind(&ImageFileInfo::isDpiOK, boost::lambda::_1)
) == container.end();
}
diff -up scantailor-0.9.11.1/ProjectFilesDialog.cpp.boost scantailor-0.9.11.1/ProjectFilesDialog.cpp
--- scantailor-0.9.11.1/ProjectFilesDialog.cpp.boost 2012-02-27 21:21:08.000000000 +0100
+++ scantailor-0.9.11.1/ProjectFilesDialog.cpp 2016-04-14 13:16:02.978858651 +0200
@@ -279,7 +279,7 @@ ProjectFilesDialog::inProjectFiles() con
using namespace boost::lambda;
std::vector<ImageFileInfo> files;
- m_ptrInProjectFiles->items(bind(&pushFileInfo<Item>, ref(files), _1));
+ m_ptrInProjectFiles->items(boost::lambda::bind(&pushFileInfo<Item>, ref(files), boost::lambda::_1));
std::sort(files.begin(), files.end(), imageFileInfoLess);
@@ -420,7 +420,7 @@ ProjectFilesDialog::setInputDir(QString
std::vector<QFileInfo> new_files(files.begin(), files.end());
std::vector<QFileInfo> existing_files;
m_ptrInProjectFiles->files(
- bind(&std::vector<QFileInfo>::push_back, var(existing_files), _1)
+ boost::lambda::bind(&std::vector<QFileInfo>::push_back, var(existing_files), boost::lambda::_1)
);
std::sort(new_files.begin(), new_files.end(), FileInfoLess());
std::sort(existing_files.begin(), existing_files.end(), FileInfoLess());
@@ -437,9 +437,9 @@ ProjectFilesDialog::setInputDir(QString
ItemList items;
std::for_each(
files.begin(), files.end(),
- bind(
+ boost::lambda::bind(
&pushItemWithFlags<Item, ItemList>,
- _1, ref(items), cref(m_supportedExtensions)
+ boost::lambda::_1, ref(items), cref(m_supportedExtensions)
)
);
@@ -471,7 +471,7 @@ ProjectFilesDialog::addToProject()
typedef std::vector<Item> ItemList;
ItemList items;
- m_ptrOffProjectFiles->items(selection, bind(&ItemList::push_back, var(items), _1));
+ m_ptrOffProjectFiles->items(selection, boost::lambda::bind(&ItemList::push_back, var(items), boost::lambda::_1));
m_ptrInProjectFiles->append(items.begin(), items.end());
m_ptrOffProjectFiles->remove(selection);
@@ -508,9 +508,9 @@ ProjectFilesDialog::removeFromProject()
ItemList items;
m_ptrInProjectFiles->items(
- selection, bind(
+ selection, boost::lambda::bind(
&pushItemIfSameDir<Item, ItemList>,
- ref(items), _1, cref(input_dir)
+ ref(items), boost::lambda::_1, cref(input_dir)
)
);
@@ -691,10 +691,10 @@ ProjectFilesDialog::FileList::remove(QIt
std::transform(
selection.begin(), selection.end(),
std::back_inserter(sorted_ranges),
- bind(
+ boost::lambda::bind(
constructor<Range>(),
- bind(&QItemSelectionRange::top, _1),
- bind(&QItemSelectionRange::bottom, _1)
+ boost::lambda::bind(&QItemSelectionRange::top, boost::lambda::_1),
+ boost::lambda::bind(&QItemSelectionRange::bottom, boost::lambda::_1)
)
);
@@ -703,7 +703,7 @@ ProjectFilesDialog::FileList::remove(QIt
std::sort(
sorted_ranges.begin(), sorted_ranges.end(),
- bind((IntMemPtr)&Range::first, _1) < bind((IntMemPtr)&Range::first, _2)
+ boost::lambda::bind((IntMemPtr)&Range::first, boost::lambda::_1) < bind((IntMemPtr)&Range::first, boost::lambda::_2)
);
QVectorIterator<Range> it(sorted_ranges);
@@ -765,9 +765,9 @@ ProjectFilesDialog::FileList::prepareFor
std::sort(
item_indexes.begin(), item_indexes.end(),
- bind(
+ boost::lambda::bind(
&ItemVisualOrdering::operator(), ItemVisualOrdering(),
- var(m_items)[_1], var(m_items)[_2]
+ var(m_items)[boost::lambda::_1], var(m_items)[boost::lambda::_2]
)
);
@@ -788,9 +788,9 @@ ProjectFilesDialog::FileList::loadNextFi
std::vector<ImageMetadata> per_page_metadata;
QString const file_path(item.fileInfo().absoluteFilePath());
ImageMetadataLoader::Status const st = ImageMetadataLoader::load(
- file_path, bind(
+ file_path, boost::lambda::bind(
&std::vector<ImageMetadata>::push_back,
- var(per_page_metadata), _1
+ var(per_page_metadata), boost::lambda::_1
)
);
diff -up scantailor-0.9.11.1/ThumbnailSequence.cpp.boost scantailor-0.9.11.1/ThumbnailSequence.cpp
--- scantailor-0.9.11.1/ThumbnailSequence.cpp.boost 2012-02-27 21:21:08.000000000 +0100
+++ scantailor-0.9.11.1/ThumbnailSequence.cpp 2016-04-14 13:16:02.979858650 +0200
@@ -489,7 +489,7 @@ ThumbnailSequence::Impl::Impl(
m_pSelectionLeader(0)
{
m_graphicsScene.setContextMenuEventCallback(
- bind(&Impl::sceneContextMenuEvent, this, _1)
+ boost::lambda::bind(&Impl::sceneContextMenuEvent, this, boost::lambda::_1)
);
}
@@ -603,7 +603,7 @@ ThumbnailSequence::Impl::invalidateThumb
{
ItemsById::iterator const id_it(m_itemsById.find(page_info.id()));
if (id_it != m_itemsById.end()) {
- m_itemsById.modify(id_it, bind(&Item::pageInfo, _1) = page_info);
+ m_itemsById.modify(id_it, boost::lambda::bind(&Item::pageInfo, boost::lambda::_1) = page_info);
invalidateThumbnailImpl(id_it);
}
}
@@ -723,10 +723,10 @@ ThumbnailSequence::Impl::invalidateAllTh
// Sort pages in m_itemsInOrder using m_ptrOrderProvider.
if (m_ptrOrderProvider.get()) {
m_itemsInOrder.sort(
- bind(
+ boost::lambda::bind(
&PageOrderProvider::precedes, m_ptrOrderProvider.get(),
- bind(&Item::pageId, _1), bind(&Item::incompleteThumbnail, _1),
- bind(&Item::pageId, _2), bind(&Item::incompleteThumbnail, _2)
+ boost::lambda::bind(&Item::pageId, boost::lambda::_1), bind(&Item::incompleteThumbnail, boost::lambda::_1),
+ boost::lambda::bind(&Item::pageId, boost::lambda::_2), bind(&Item::incompleteThumbnail, boost::lambda::_2)
)
);
}