File r1048697-const-iterators.diff of Package NetworkManager-kde4
Index: libs/service/networkinterfaceactivatableprovider.cpp
===================================================================
--- libs/service/networkinterfaceactivatableprovider.cpp (revision 1048696)
+++ libs/service/networkinterfaceactivatableprovider.cpp (revision 1048697)
@@ -178,8 +178,8 @@
void NetworkInterfaceActivatableProvider::handleUpdate(Knm::Connection * updatedConnection)
{
Q_D(NetworkInterfaceActivatableProvider);
- QMultiHash<QString, Knm::InterfaceConnection*>::const_iterator i = d->activatables.find(updatedConnection->uuid());
- while (i != d->activatables.end() && i.key() == updatedConnection->uuid()) {
+ QMultiHash<QString, Knm::InterfaceConnection*>::const_iterator i = d->activatables.constFind(updatedConnection->uuid());
+ while (i != d->activatables.constEnd() && i.key() == updatedConnection->uuid()) {
Knm::InterfaceConnection * ifaceConnection = dynamic_cast<Knm::InterfaceConnection *>(i.value());
if (ifaceConnection) {
Knm::InterfaceConnectionHelpers::syncInterfaceConnection(ifaceConnection, updatedConnection);
Index: libs/ui/editlistdialog.cpp
===================================================================
--- libs/ui/editlistdialog.cpp (revision 1048696)
+++ libs/ui/editlistdialog.cpp (revision 1048697)
@@ -64,7 +64,7 @@
void removeEmptyItems(QStringList &list)
{
QStringList::iterator it = list.begin();
- QStringList::const_iterator end = list.constEnd();
+ const QStringList::iterator end = list.end();
while (it != end) {
if ((*it).trimmed().isEmpty()) {
it = list.erase(it);