summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/itemviews/qlistwidget.cpp6
-rw-r--r--src/widgets/itemviews/qtablewidget.cpp6
-rw-r--r--src/widgets/itemviews/qtreewidget.cpp6
-rw-r--r--src/widgets/widgets/qwidgettextcontrol.cpp6
4 files changed, 16 insertions, 8 deletions
diff --git a/src/widgets/itemviews/qlistwidget.cpp b/src/widgets/itemviews/qlistwidget.cpp
index 39889a6b29..7e882b3ce4 100644
--- a/src/widgets/itemviews/qlistwidget.cpp
+++ b/src/widgets/itemviews/qlistwidget.cpp
@@ -47,6 +47,8 @@
#include <private/qwidgetitemdata_p.h>
#include <private/qlistwidget_p.h>
+#include <algorithm>
+
QT_BEGIN_NAMESPACE
// workaround for VC++ 6.0 linker bug (?)
@@ -401,8 +403,8 @@ QList<QListWidgetItem*>::iterator QListModel::sortedInsertionIterator(
Qt::SortOrder order, QListWidgetItem *item)
{
if (order == Qt::AscendingOrder)
- return qLowerBound(begin, end, item, QListModelLessThan());
- return qLowerBound(begin, end, item, QListModelGreaterThan());
+ return std::lower_bound(begin, end, item, QListModelLessThan());
+ return std::lower_bound(begin, end, item, QListModelGreaterThan());
}
void QListModel::itemChanged(QListWidgetItem *item)
diff --git a/src/widgets/itemviews/qtablewidget.cpp b/src/widgets/itemviews/qtablewidget.cpp
index c36ec3d714..7b58b000ad 100644
--- a/src/widgets/itemviews/qtablewidget.cpp
+++ b/src/widgets/itemviews/qtablewidget.cpp
@@ -46,6 +46,8 @@
#include <qpainter.h>
#include <private/qtablewidget_p.h>
+#include <algorithm>
+
QT_BEGIN_NAMESPACE
QTableModel::QTableModel(int rows, int columns, QTableWidget *parent)
@@ -671,8 +673,8 @@ QVector<QTableWidgetItem*>::iterator QTableModel::sortedInsertionIterator(
Qt::SortOrder order, QTableWidgetItem *item)
{
if (order == Qt::AscendingOrder)
- return qLowerBound(begin, end, item, QTableModelLessThan());
- return qLowerBound(begin, end, item, QTableModelGreaterThan());
+ return std::lower_bound(begin, end, item, QTableModelLessThan());
+ return std::lower_bound(begin, end, item, QTableModelGreaterThan());
}
bool QTableModel::itemLessThan(const QPair<QTableWidgetItem*,int> &left,
diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp
index aa614e8191..d616912b37 100644
--- a/src/widgets/itemviews/qtreewidget.cpp
+++ b/src/widgets/itemviews/qtreewidget.cpp
@@ -51,6 +51,8 @@
#include <private/qwidgetitemdata_p.h>
#include <private/qtreewidgetitemiterator_p.h>
+#include <algorithm>
+
QT_BEGIN_NAMESPACE
// workaround for VC++ 6.0 linker bug (?)
@@ -709,8 +711,8 @@ QList<QTreeWidgetItem*>::iterator QTreeModel::sortedInsertionIterator(
Qt::SortOrder order, QTreeWidgetItem *item)
{
if (order == Qt::AscendingOrder)
- return qLowerBound(begin, end, item, QTreeModelLessThan());
- return qLowerBound(begin, end, item, QTreeModelGreaterThan());
+ return std::lower_bound(begin, end, item, QTreeModelLessThan());
+ return std::lower_bound(begin, end, item, QTreeModelGreaterThan());
}
QStringList QTreeModel::mimeTypes() const
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
index 7b887c0306..c60aa4b02d 100644
--- a/src/widgets/widgets/qwidgettextcontrol.cpp
+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
@@ -94,6 +94,8 @@
#define ACCEL_KEY(k) QString()
#endif
+#include <algorithm>
+
QT_BEGIN_NAMESPACE
// could go into QTextCursor...
@@ -1422,8 +1424,8 @@ static QRectF boundingRectOfFloatsInSelection(const QTextCursor &cursor)
QTextFrame *frame = cursor.currentFrame();
const QList<QTextFrame *> children = frame->childFrames();
- const QList<QTextFrame *>::ConstIterator firstFrame = qLowerBound(children.constBegin(), children.constEnd(),
- cursor.selectionStart(), firstFramePosLessThanCursorPos);
+ const QList<QTextFrame *>::ConstIterator firstFrame = std::lower_bound(children.constBegin(), children.constEnd(),
+ cursor.selectionStart(), firstFramePosLessThanCursorPos);
const QList<QTextFrame *>::ConstIterator lastFrame = qUpperBound(children.constBegin(), children.constEnd(),
cursor.selectionEnd(), cursorPosLessThanLastFramePos);
for (QList<QTextFrame *>::ConstIterator it = firstFrame; it != lastFrame; ++it) {