projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace deprecated qSort with std::sort
[quassel.git]
/
src
/
client
/
networkmodel.cpp
diff --git
a/src/client/networkmodel.cpp
b/src/client/networkmodel.cpp
index
752eb1e
..
4713932
100644
(file)
--- a/
src/client/networkmodel.cpp
+++ b/
src/client/networkmodel.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
8
by the Quassel Project *
+ * Copyright (C) 2005-201
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-405,7
+405,6
@@
bool BufferItem::setData(int column, const QVariant& value, int role)
default:
return PropertyMapItem::setData(column, value, role);
}
default:
return PropertyMapItem::setData(column, value, role);
}
- return true;
}
void BufferItem::setBufferName(const QString& name)
}
void BufferItem::setBufferName(const QString& name)
@@
-1606,7
+1605,7
@@
void NetworkModel::sortBufferIds(QList<BufferId>& bufferIds) const
bufferItems << _bufferItemCache[bufferId];
}
bufferItems << _bufferItemCache[bufferId];
}
-
qS
ort(bufferItems.begin(), bufferItems.end(), bufferItemLessThan);
+
std::s
ort(bufferItems.begin(), bufferItems.end(), bufferItemLessThan);
bufferIds.clear();
foreach (BufferItem* bufferItem, bufferItems) {
bufferIds.clear();
foreach (BufferItem* bufferItem, bufferItems) {