Replace Q_FOREACH with C++11 range-for
ClosedPublic
Actions

Authored by jeanv on Jul 15 2017, 5:57 PM.

Details

Reviewers

nicolasfella
apol

Group Reviewers

KDE Connect

Commits

R224:c864267f04a3: Replace Q_FOREACH with C++11 range-for

Summary

The use of Q_FOREACH is advised against (https://doc.qt.io/qt-5/qtglobal.html#Q_FOREACH) since Qt 5.7 and will eventually be removed from Qt.

I replaced all occurrences with the range-for loop introduced in C++11 (except for the one in daemon.cpp in deviceIdByName which might have a bug / typo in it).

I added const to the container or casted it with qAsConst when appropriate to avoid unnecessary copies.

(This is my first submission. I did all the unit tests, and they all passed but I don't know how to show it here.)

Diff Detail

Repository

R224 KDE Connect

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

jeanv created this revision.Jul 15 2017, 5:57 PM

jeanv added a reviewer: KDE Connect.

jeanv edited the summary of this revision. (Show Details)Jul 15 2017, 6:03 PM

Looks good to me :) As you probably don't have a developer account Albert will push the changes for you

This revision is now accepted and ready to land.Jul 15 2017, 6:29 PM

except for the one in daemon.cpp in deviceIdByName which might have a bug / typo in it

This seems to be just really bad naming. d is also the name of a member variable. The Device* should be renamed to avoid such confusion

In D6724#125760, @nicolasfella wrote:

except for the one in daemon.cpp in deviceIdByName which might have a bug / typo in it

This seems to be just really bad naming. d is also the name of a member variable. The Device* should be renamed to avoid such confusion

That's what I thought, but I wasn't sure so I didn't touch it. Thanks for clarifying

I'll update the diff with the Q_FOREACH removed (and the name changed).

Remove the remaining Q_FOREACH in daemon.cpp in deviceIdByName and rename the variable d to device to avoid confusion.

Looks good to me.

Can you give me your email, so I can push this on your behalf?

In D6724#127025, @albertvaka wrote:

Can you give me your email, so I can push this on your behalf?

Sure: jean.vincent@posteo.net

Closed by commit R224:c864267f04a3: Replace Q_FOREACH with C++11 range-for (authored by jeanv, committed by albertvaka). · Explain WhyJul 21 2017, 7:57 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			cli/kdeconnect-cli.cpp (2 lines)
M			core/backends/bluetooth/bluetoothlinkprovider.cpp (4 lines)
M			core/daemon.cpp (18 lines)
M			core/device.cpp (18 lines)
M			core/pluginloader.cpp (10 lines)
M			fileitemactionplugin/sendfileitemaction.cpp (6 lines)
M			interfaces/devicesmodel.cpp (2 lines)
M			interfaces/notificationsmodel.cpp (6 lines)
M			kio/kiokdeconnect.cpp (4 lines)
M			plasmoid/declarativeplugin/responsewaiter.cpp (2 lines)
M			plugins/mpriscontrol/mpriscontrolplugin.cpp (4 lines)
M			plugins/notifications/notificationsdbusinterface.cpp (2 lines)
M			plugins/pausemusic/pausemusicplugin.cpp (6 lines)
M			plugins/runcommand/runcommand_config.cpp (3 lines)
M			plugins/sendnotifications/notificationslistener.cpp (6 lines)
M			tests/pluginloadtest.cpp (3 lines)
M			tests/sendfiletest.cpp (3 lines)
M			tests/testnotificationlistener.cpp (3 lines)
M			tests/testsocketlinereader.cpp (2 lines)
M			tests/testsslsocketlinereader.cpp (4 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	16747			Jul 15 2017, 4:45 PM	★	★
Diff 2	16756			Jul 15 2017, 7:20 PM	★	★
Diff 3	16959	aa30780	R224:c864267f04a3b9bf5794bd1352d1c6baf653fa2d	Jul 21 2017, 7:57 AM	★	★