unity-2d

Merge lp:~aacid/unity-2d/foreachconstref into lp:unity-2d

  1. foreachconstref
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Gerry Boland
Approved revision: 790
Merged at revision: 790
Proposed branch: lp:~aacid/unity-2d/foreachconstref
Merge into: lp:unity-2d
Diff against target: 143 lines (+12/-12)
9 files modified
libunity-2d-private/src/indicatorswidget.cpp (+2/-2)
libunity-2d-private/src/launcherapplication.cpp (+1/-1)
libunity-2d-private/src/launcherapplicationslist.cpp (+1/-1)
libunity-2d-private/src/launcherdropitem.cpp (+2/-2)
libunity-2d-private/src/mimedata.cpp (+1/-1)
libunity-2d-private/src/trash.cpp (+2/-2)
panel/app/panelmanager.cpp (+1/-1)
panel/applets/appindicator/appindicatorapplet.cpp (+1/-1)
panel/applets/appname/menubarwidget.cpp (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity-2d/foreachconstref
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Review via email: mp+83257@code.launchpad.net

Commit message

[code] Add const & for foreach "iterators"

Avoids a copy of each object. It is true that most of those objects are
implicitly shared so the win isn't huge but we still save some atomic/mutex/something locking

Description of the change

[code] Add const & for foreach "iterators"

Avoids a copy of each object. It is true that most of those objects are
implicitly shared so the win isn't huge but we still save some atomic/mutex/something locking

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

Great, thank you!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libunity-2d-private/src/indicatorswidget.cpp'
--- libunity-2d-private/src/indicatorswidget.cpp 2011-09-28 07:05:56 +0000
+++ libunity-2d-private/src/indicatorswidget.cpp 2011-11-24 08:53:25 +0000
@@ -43,7 +43,7 @@
43IndicatorsWidget::~IndicatorsWidget()43IndicatorsWidget::~IndicatorsWidget()
44{44{
45 /* Disconnect from all the indicators' signals 'on_entry_added' and 'on_entry_removed' */45 /* Disconnect from all the indicators' signals 'on_entry_added' and 'on_entry_removed' */
46 Q_FOREACH(QList<sigc::connection> connections, m_indicators_connections) {46 Q_FOREACH(const QList<sigc::connection>& connections, m_indicators_connections) {
47 Q_FOREACH(sigc::connection connection, connections) {47 Q_FOREACH(sigc::connection connection, connections) {
48 connection.disconnect();48 connection.disconnect();
49 }49 }
@@ -72,7 +72,7 @@
72 conn.disconnect();72 conn.disconnect();
73 }73 }
7474
75 Q_FOREACH(Entry::Ptr entry, indicator->GetEntries())75 Q_FOREACH(const Entry::Ptr& entry, indicator->GetEntries())
76 {76 {
77 onEntryRemoved (entry->id());77 onEntryRemoved (entry->id());
78 }78 }
7979
=== modified file 'libunity-2d-private/src/launcherapplication.cpp'
--- libunity-2d-private/src/launcherapplication.cpp 2011-09-14 08:50:54 +0000
+++ libunity-2d-private/src/launcherapplication.cpp 2011-11-24 08:53:25 +0000
@@ -820,7 +820,7 @@
820void820void
821LauncherApplication::fetchIndicatorMenus()821LauncherApplication::fetchIndicatorMenus()
822{822{
823 Q_FOREACH(QString path, m_indicatorMenus.keys()) {823 Q_FOREACH(const QString& path, m_indicatorMenus.keys()) {
824 m_indicatorMenus.take(path)->deleteLater();824 m_indicatorMenus.take(path)->deleteLater();
825 }825 }
826826
827827
=== modified file 'libunity-2d-private/src/launcherapplicationslist.cpp'
--- libunity-2d-private/src/launcherapplicationslist.cpp 2011-11-18 10:15:49 +0000
+++ libunity-2d-private/src/launcherapplicationslist.cpp 2011-11-24 08:53:25 +0000
@@ -393,7 +393,7 @@
393 QString desktop_file;393 QString desktop_file;
394 QStringList favorites = launcherConfiguration().property("favorites").toStringList();394 QStringList favorites = launcherConfiguration().property("favorites").toStringList();
395395
396 Q_FOREACH(QString favorite, favorites) {396 Q_FOREACH(const QString& favorite, favorites) {
397 insertFavoriteApplication(favorite);397 insertFavoriteApplication(favorite);
398 }398 }
399399
400400
=== modified file 'libunity-2d-private/src/launcherdropitem.cpp'
--- libunity-2d-private/src/launcherdropitem.cpp 2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/launcherdropitem.cpp 2011-11-24 08:53:25 +0000
@@ -28,7 +28,7 @@
2828
29void LauncherDropItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event)29void LauncherDropItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
30{30{
31 Q_FOREACH(QUrl url, getEventUrls(event)) {31 Q_FOREACH(const QUrl& url, getEventUrls(event)) {
32 if ((url.scheme() == "file" && url.path().endsWith(".desktop")) ||32 if ((url.scheme() == "file" && url.path().endsWith(".desktop")) ||
33 url.scheme().startsWith("http")) {33 url.scheme().startsWith("http")) {
34 event->setAccepted(true);34 event->setAccepted(true);
@@ -40,7 +40,7 @@
4040
41void LauncherDropItem::dropEvent(QGraphicsSceneDragDropEvent *event)41void LauncherDropItem::dropEvent(QGraphicsSceneDragDropEvent *event)
42{42{
43 Q_FOREACH(QUrl url, getEventUrls(event)) {43 Q_FOREACH(const QUrl& url, getEventUrls(event)) {
44 if (url.scheme() == "file" && url.path().endsWith(".desktop")) {44 if (url.scheme() == "file" && url.path().endsWith(".desktop")) {
45 desktopFileDropped(url.path());45 desktopFileDropped(url.path());
46 } else if (url.scheme().startsWith("http")) {46 } else if (url.scheme().startsWith("http")) {
4747
=== modified file 'libunity-2d-private/src/mimedata.cpp'
--- libunity-2d-private/src/mimedata.cpp 2011-02-15 10:28:23 +0000
+++ libunity-2d-private/src/mimedata.cpp 2011-11-24 08:53:25 +0000
@@ -22,7 +22,7 @@
22DeclarativeMimeData::DeclarativeMimeData(const QMimeData* data)22DeclarativeMimeData::DeclarativeMimeData(const QMimeData* data)
23 : QMimeData()23 : QMimeData()
24{24{
25 Q_FOREACH(QString format, data->formats()) {25 Q_FOREACH(const QString& format, data->formats()) {
26 setData(format, data->data(format));26 setData(format, data->data(format));
27 }27 }
28}28}
2929
=== modified file 'libunity-2d-private/src/trash.cpp'
--- libunity-2d-private/src/trash.cpp 2011-09-07 13:16:47 +0000
+++ libunity-2d-private/src/trash.cpp 2011-11-24 08:53:25 +0000
@@ -227,7 +227,7 @@
227void227void
228Trash::onDragEnter(DeclarativeDragDropEvent* event)228Trash::onDragEnter(DeclarativeDragDropEvent* event)
229{229{
230 Q_FOREACH(QUrl url, event->mimeData()->urls()) {230 Q_FOREACH(const QUrl& url, event->mimeData()->urls()) {
231 if (url.scheme() == "file") {231 if (url.scheme() == "file") {
232 event->setDropAction(Qt::MoveAction);232 event->setDropAction(Qt::MoveAction);
233 event->setAccepted(true);233 event->setAccepted(true);
@@ -239,7 +239,7 @@
239void239void
240Trash::onDrop(DeclarativeDragDropEvent* event)240Trash::onDrop(DeclarativeDragDropEvent* event)
241{241{
242 Q_FOREACH(QUrl url, event->mimeData()->urls()) {242 Q_FOREACH(const QUrl& url, event->mimeData()->urls()) {
243 if (url.scheme() == "file") {243 if (url.scheme() == "file") {
244 GFile* file = g_file_new_for_path(url.toLocalFile().toUtf8().constData());244 GFile* file = g_file_new_for_path(url.toLocalFile().toUtf8().constData());
245 if (!g_file_trash(file, NULL, NULL)) {245 if (!g_file_trash(file, NULL, NULL)) {
246246
=== modified file 'panel/app/panelmanager.cpp'
--- panel/app/panelmanager.cpp 2011-11-18 10:15:49 +0000
+++ panel/app/panelmanager.cpp 2011-11-24 08:53:25 +0000
@@ -77,7 +77,7 @@
77 filters << "*.so";77 filters << "*.so";
78 pluginDir.setNameFilters(filters);78 pluginDir.setNameFilters(filters);
7979
80 Q_FOREACH(QString fileEntry, pluginDir.entryList()) {80 Q_FOREACH(const QString& fileEntry, pluginDir.entryList()) {
81 QString pluginFilePath = pluginDir.absoluteFilePath(fileEntry);81 QString pluginFilePath = pluginDir.absoluteFilePath(fileEntry);
82 qDebug() << "Loading panel plugin:" << pluginFilePath;82 qDebug() << "Loading panel plugin:" << pluginFilePath;
8383
8484
=== modified file 'panel/applets/appindicator/appindicatorapplet.cpp'
--- panel/applets/appindicator/appindicatorapplet.cpp 2011-08-22 09:17:03 +0000
+++ panel/applets/appindicator/appindicatorapplet.cpp 2011-11-24 08:53:25 +0000
@@ -67,7 +67,7 @@
67void AppIndicatorApplet::createItems()67void AppIndicatorApplet::createItems()
68{68{
69 QStringList ids = m_watcher->property("RegisteredStatusNotifierItems").toStringList();69 QStringList ids = m_watcher->property("RegisteredStatusNotifierItems").toStringList();
70 Q_FOREACH(QString id, ids) {70 Q_FOREACH(const QString& id, ids) {
71 createItem(id);71 createItem(id);
72 }72 }
73}73}
7474
=== modified file 'panel/applets/appname/menubarwidget.cpp'
--- panel/applets/appname/menubarwidget.cpp 2011-09-28 07:05:56 +0000
+++ panel/applets/appname/menubarwidget.cpp 2011-11-24 08:53:25 +0000
@@ -106,7 +106,7 @@
106 entry_added.disconnect();106 entry_added.disconnect();
107 entry_removed.disconnect();107 entry_removed.disconnect();
108108
109 Q_FOREACH(unity::indicator::Entry::Ptr entry, m_indicator->GetEntries())109 Q_FOREACH(const unity::indicator::Entry::Ptr& entry, m_indicator->GetEntries())
110 {110 {
111 onEntryRemoved (entry->id());111 onEntryRemoved (entry->id());
112 }112 }

Subscribers

People subscribed via source and target branches