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
1=== modified file 'libunity-2d-private/src/indicatorswidget.cpp'
2--- libunity-2d-private/src/indicatorswidget.cpp 2011-09-28 07:05:56 +0000
3+++ libunity-2d-private/src/indicatorswidget.cpp 2011-11-24 08:53:25 +0000
4@@ -43,7 +43,7 @@
5 IndicatorsWidget::~IndicatorsWidget()
6 {
7 /* Disconnect from all the indicators' signals 'on_entry_added' and 'on_entry_removed' */
8- Q_FOREACH(QList<sigc::connection> connections, m_indicators_connections) {
9+ Q_FOREACH(const QList<sigc::connection>& connections, m_indicators_connections) {
10 Q_FOREACH(sigc::connection connection, connections) {
11 connection.disconnect();
12 }
13@@ -72,7 +72,7 @@
14 conn.disconnect();
15 }
16
17- Q_FOREACH(Entry::Ptr entry, indicator->GetEntries())
18+ Q_FOREACH(const Entry::Ptr& entry, indicator->GetEntries())
19 {
20 onEntryRemoved (entry->id());
21 }
22
23=== modified file 'libunity-2d-private/src/launcherapplication.cpp'
24--- libunity-2d-private/src/launcherapplication.cpp 2011-09-14 08:50:54 +0000
25+++ libunity-2d-private/src/launcherapplication.cpp 2011-11-24 08:53:25 +0000
26@@ -820,7 +820,7 @@
27 void
28 LauncherApplication::fetchIndicatorMenus()
29 {
30- Q_FOREACH(QString path, m_indicatorMenus.keys()) {
31+ Q_FOREACH(const QString& path, m_indicatorMenus.keys()) {
32 m_indicatorMenus.take(path)->deleteLater();
33 }
34
35
36=== modified file 'libunity-2d-private/src/launcherapplicationslist.cpp'
37--- libunity-2d-private/src/launcherapplicationslist.cpp 2011-11-18 10:15:49 +0000
38+++ libunity-2d-private/src/launcherapplicationslist.cpp 2011-11-24 08:53:25 +0000
39@@ -393,7 +393,7 @@
40 QString desktop_file;
41 QStringList favorites = launcherConfiguration().property("favorites").toStringList();
42
43- Q_FOREACH(QString favorite, favorites) {
44+ Q_FOREACH(const QString& favorite, favorites) {
45 insertFavoriteApplication(favorite);
46 }
47
48
49=== modified file 'libunity-2d-private/src/launcherdropitem.cpp'
50--- libunity-2d-private/src/launcherdropitem.cpp 2011-07-29 13:49:34 +0000
51+++ libunity-2d-private/src/launcherdropitem.cpp 2011-11-24 08:53:25 +0000
52@@ -28,7 +28,7 @@
53
54 void LauncherDropItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
55 {
56- Q_FOREACH(QUrl url, getEventUrls(event)) {
57+ Q_FOREACH(const QUrl& url, getEventUrls(event)) {
58 if ((url.scheme() == "file" && url.path().endsWith(".desktop")) ||
59 url.scheme().startsWith("http")) {
60 event->setAccepted(true);
61@@ -40,7 +40,7 @@
62
63 void LauncherDropItem::dropEvent(QGraphicsSceneDragDropEvent *event)
64 {
65- Q_FOREACH(QUrl url, getEventUrls(event)) {
66+ Q_FOREACH(const QUrl& url, getEventUrls(event)) {
67 if (url.scheme() == "file" && url.path().endsWith(".desktop")) {
68 desktopFileDropped(url.path());
69 } else if (url.scheme().startsWith("http")) {
70
71=== modified file 'libunity-2d-private/src/mimedata.cpp'
72--- libunity-2d-private/src/mimedata.cpp 2011-02-15 10:28:23 +0000
73+++ libunity-2d-private/src/mimedata.cpp 2011-11-24 08:53:25 +0000
74@@ -22,7 +22,7 @@
75 DeclarativeMimeData::DeclarativeMimeData(const QMimeData* data)
76 : QMimeData()
77 {
78- Q_FOREACH(QString format, data->formats()) {
79+ Q_FOREACH(const QString& format, data->formats()) {
80 setData(format, data->data(format));
81 }
82 }
83
84=== modified file 'libunity-2d-private/src/trash.cpp'
85--- libunity-2d-private/src/trash.cpp 2011-09-07 13:16:47 +0000
86+++ libunity-2d-private/src/trash.cpp 2011-11-24 08:53:25 +0000
87@@ -227,7 +227,7 @@
88 void
89 Trash::onDragEnter(DeclarativeDragDropEvent* event)
90 {
91- Q_FOREACH(QUrl url, event->mimeData()->urls()) {
92+ Q_FOREACH(const QUrl& url, event->mimeData()->urls()) {
93 if (url.scheme() == "file") {
94 event->setDropAction(Qt::MoveAction);
95 event->setAccepted(true);
96@@ -239,7 +239,7 @@
97 void
98 Trash::onDrop(DeclarativeDragDropEvent* event)
99 {
100- Q_FOREACH(QUrl url, event->mimeData()->urls()) {
101+ Q_FOREACH(const QUrl& url, event->mimeData()->urls()) {
102 if (url.scheme() == "file") {
103 GFile* file = g_file_new_for_path(url.toLocalFile().toUtf8().constData());
104 if (!g_file_trash(file, NULL, NULL)) {
105
106=== modified file 'panel/app/panelmanager.cpp'
107--- panel/app/panelmanager.cpp 2011-11-18 10:15:49 +0000
108+++ panel/app/panelmanager.cpp 2011-11-24 08:53:25 +0000
109@@ -77,7 +77,7 @@
110 filters << "*.so";
111 pluginDir.setNameFilters(filters);
112
113- Q_FOREACH(QString fileEntry, pluginDir.entryList()) {
114+ Q_FOREACH(const QString& fileEntry, pluginDir.entryList()) {
115 QString pluginFilePath = pluginDir.absoluteFilePath(fileEntry);
116 qDebug() << "Loading panel plugin:" << pluginFilePath;
117
118
119=== modified file 'panel/applets/appindicator/appindicatorapplet.cpp'
120--- panel/applets/appindicator/appindicatorapplet.cpp 2011-08-22 09:17:03 +0000
121+++ panel/applets/appindicator/appindicatorapplet.cpp 2011-11-24 08:53:25 +0000
122@@ -67,7 +67,7 @@
123 void AppIndicatorApplet::createItems()
124 {
125 QStringList ids = m_watcher->property("RegisteredStatusNotifierItems").toStringList();
126- Q_FOREACH(QString id, ids) {
127+ Q_FOREACH(const QString& id, ids) {
128 createItem(id);
129 }
130 }
131
132=== modified file 'panel/applets/appname/menubarwidget.cpp'
133--- panel/applets/appname/menubarwidget.cpp 2011-09-28 07:05:56 +0000
134+++ panel/applets/appname/menubarwidget.cpp 2011-11-24 08:53:25 +0000
135@@ -106,7 +106,7 @@
136 entry_added.disconnect();
137 entry_removed.disconnect();
138
139- Q_FOREACH(unity::indicator::Entry::Ptr entry, m_indicator->GetEntries())
140+ Q_FOREACH(const unity::indicator::Entry::Ptr& entry, m_indicator->GetEntries())
141 {
142 onEntryRemoved (entry->id());
143 }

Subscribers

People subscribed via source and target branches