unity-2d

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

  1. addSomeConstRef
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Gerry Boland
Approved revision: 851
Merged at revision: 853
Proposed branch: lp:~aacid/unity-2d/addSomeConstRef
Merge into: lp:unity-2d
Diff against target: 376 lines (+50/-52)
12 files modified
libunity-2d-private/src/launcherapplication.cpp (+3/-3)
libunity-2d-private/src/launcherapplication.h (+3/-3)
libunity-2d-private/src/launcherapplicationslist.cpp (+1/-1)
libunity-2d-private/src/launcherapplicationslist.h (+1/-1)
libunity-2d-private/src/place.cpp (+1/-1)
libunity-2d-private/src/place.h (+1/-1)
libunity-2d-private/src/placeentry.cpp (+18/-18)
libunity-2d-private/src/placeentry.h (+18/-20)
libunity-2d-private/src/windowimageprovider.cpp (+1/-1)
libunity-2d-private/src/windowimageprovider.h (+1/-1)
panel/applets/legacytray/x11embedcontainer.cpp (+1/-1)
panel/applets/legacytray/x11embedcontainer.h (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity-2d/addSomeConstRef
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Review via email: mp+88513@code.launchpad.net

Description of the change

Add some const &

It is true that those classes are refcounted so the win is not huge, but there's no reason not to save some locks in some atomic integers used for the ref/unrefing

To post a comment you must log in.
lp:~aacid/unity-2d/addSomeConstRef updated
850. By Albert Astals Cid

Another const &

851. By Albert Astals Cid

Another const &

Revision history for this message
Gerry Boland (gerboland) :
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/launcherapplication.cpp'
2--- libunity-2d-private/src/launcherapplication.cpp 2012-01-03 11:24:53 +0000
3+++ libunity-2d-private/src/launcherapplication.cpp 2012-01-13 15:33:01 +0000
4@@ -988,8 +988,8 @@
5 }
6
7 template<typename T>
8-bool LauncherApplication::updateOverlayState(QMap<QString, QVariant> properties,
9- QString propertyName, T* member)
10+bool LauncherApplication::updateOverlayState(const QMap<QString, QVariant>& properties,
11+ const QString& propertyName, T* member)
12 {
13 if (properties.contains(propertyName)) {
14 T value = properties.value(propertyName).value<T>();
15@@ -1002,7 +1002,7 @@
16 }
17
18 void
19-LauncherApplication::updateOverlaysState(const QString& sender, QMap<QString, QVariant> properties)
20+LauncherApplication::updateOverlaysState(const QString& sender, const QMap<QString, QVariant>& properties)
21 {
22 if (updateOverlayState(properties, "progress", &m_progress)) {
23 Q_EMIT progressChanged(m_progress);
24
25=== modified file 'libunity-2d-private/src/launcherapplication.h'
26--- libunity-2d-private/src/launcherapplication.h 2011-08-09 11:28:45 +0000
27+++ libunity-2d-private/src/launcherapplication.h 2012-01-13 15:33:01 +0000
28@@ -105,7 +105,7 @@
29
30 Q_INVOKABLE virtual void createMenuActions();
31
32- void updateOverlaysState(const QString& sender, QMap<QString, QVariant> properties);
33+ void updateOverlaysState(const QString& sender, const QMap<QString, QVariant>& properties);
34
35 Q_SIGNALS:
36 void stickyChanged(bool);
37@@ -171,8 +171,8 @@
38 void createStaticMenuActions();
39 int windowCountOnCurrentWorkspace();
40 template<typename T>
41- bool updateOverlayState(QMap<QString, QVariant> properties,
42- QString propertyName, T* member);
43+ bool updateOverlayState(const QMap<QString, QVariant>& properties,
44+ const QString& propertyName, T* member);
45
46 QString m_dynamicQuicklistPath;
47 QScopedPointer<DBusMenuImporter> m_dynamicQuicklistImporter;
48
49=== modified file 'libunity-2d-private/src/launcherapplicationslist.cpp'
50--- libunity-2d-private/src/launcherapplicationslist.cpp 2011-11-24 08:45:18 +0000
51+++ libunity-2d-private/src/launcherapplicationslist.cpp 2012-01-13 15:33:01 +0000
52@@ -306,7 +306,7 @@
53 }
54
55 void
56-LauncherApplicationsList::insertFavoriteApplication(QString desktop_file)
57+LauncherApplicationsList::insertFavoriteApplication(const QString& desktop_file)
58 {
59 if (m_applicationForDesktopFile.contains(desktop_file)) {
60 return;
61
62=== modified file 'libunity-2d-private/src/launcherapplicationslist.h'
63--- libunity-2d-private/src/launcherapplicationslist.h 2011-11-18 10:15:49 +0000
64+++ libunity-2d-private/src/launcherapplicationslist.h 2012-01-13 15:33:01 +0000
65@@ -49,7 +49,7 @@
66 QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const;
67 int rowCount(const QModelIndex & parent = QModelIndex()) const;
68
69- Q_INVOKABLE void insertFavoriteApplication(QString desktop_file);
70+ Q_INVOKABLE void insertFavoriteApplication(const QString& desktop_file);
71 Q_INVOKABLE void insertWebFavorite(const QUrl& url);
72
73 public Q_SLOTS:
74
75=== modified file 'libunity-2d-private/src/place.cpp'
76--- libunity-2d-private/src/place.cpp 2011-07-29 13:49:34 +0000
77+++ libunity-2d-private/src/place.cpp 2012-01-13 15:33:01 +0000
78@@ -409,7 +409,7 @@
79 }
80
81 void
82-Place::activate(QString uri)
83+Place::activate(const QString& uri)
84 {
85 /* Tries various methods to trigger a sensible action for the given 'uri'.
86 First it asks the place backend via its 'Activate' method. If that fails
87
88=== modified file 'libunity-2d-private/src/place.h'
89--- libunity-2d-private/src/place.h 2011-07-29 13:49:34 +0000
90+++ libunity-2d-private/src/place.h 2012-01-13 15:33:01 +0000
91@@ -67,7 +67,7 @@
92 int rowCount(const QModelIndex& parent = QModelIndex()) const;
93
94 PlaceEntry* findPlaceEntry(const QString& groupName);
95- Q_INVOKABLE void activate(QString uri);
96+ Q_INVOKABLE void activate(const QString& uri);
97
98 Q_SIGNALS:
99 void entryAdded(PlaceEntry*);
100
101=== modified file 'libunity-2d-private/src/placeentry.cpp'
102--- libunity-2d-private/src/placeentry.cpp 2011-08-23 17:46:06 +0000
103+++ libunity-2d-private/src/placeentry.cpp 2012-01-13 15:33:01 +0000
104@@ -238,7 +238,7 @@
105 }
106
107 void
108-PlaceEntry::setName(QString name)
109+PlaceEntry::setName(const QString& name)
110 {
111 m_name = name;
112 }
113@@ -250,7 +250,7 @@
114 }
115
116 void
117-PlaceEntry::setIcon(QString icon)
118+PlaceEntry::setIcon(const QString& icon)
119 {
120 m_icon = icon;
121 }
122@@ -270,7 +270,7 @@
123 }
124
125 void
126-PlaceEntry::setFileName(QString fileName)
127+PlaceEntry::setFileName(const QString& fileName)
128 {
129 m_fileName = fileName;
130 }
131@@ -282,7 +282,7 @@
132 }
133
134 void
135-PlaceEntry::setGroupName(QString groupName)
136+PlaceEntry::setGroupName(const QString& groupName)
137 {
138 m_groupName = groupName;
139 }
140@@ -468,13 +468,13 @@
141 }
142
143 void
144-PlaceEntry::setDbusName(QString dbusName)
145+PlaceEntry::setDbusName(const QString& dbusName)
146 {
147 m_dbusName = dbusName;
148 }
149
150 void
151-PlaceEntry::setDbusObjectPath(QString dbusObjectPath)
152+PlaceEntry::setDbusObjectPath(const QString& dbusObjectPath)
153 {
154 m_dbusObjectPath = dbusObjectPath;
155 }
156@@ -489,7 +489,7 @@
157 }
158
159 void
160-PlaceEntry::setMimetypes(QStringList mimetypes)
161+PlaceEntry::setMimetypes(const QStringList& mimetypes)
162 {
163 m_mimetypes = mimetypes;
164 Q_EMIT mimetypesChanged();
165@@ -518,7 +518,7 @@
166 }
167
168 void
169-PlaceEntry::setHints(QMap<QString, QVariant> hints)
170+PlaceEntry::setHints(const QMap<QString, QVariant>& hints)
171 {
172 m_hints = hints;
173 Q_EMIT hintsChanged();
174@@ -575,7 +575,7 @@
175 }
176
177 void
178-PlaceEntry::setEntrySearchQuery(QString entrySearchQuery)
179+PlaceEntry::setEntrySearchQuery(const QString& entrySearchQuery)
180 {
181 if (entrySearchQuery != m_entrySearchQuery) {
182 m_entrySearchQuery = entrySearchQuery;
183@@ -588,7 +588,7 @@
184 }
185
186 void
187-PlaceEntry::setEntryRendererName(QString entryRendererName)
188+PlaceEntry::setEntryRendererName(const QString& entryRendererName)
189 {
190 if (entryRendererName != m_entryRendererName) {
191 m_entryRendererName = entryRendererName;
192@@ -597,7 +597,7 @@
193 }
194
195 void
196-PlaceEntry::setEntryGroupsModelName(QString entryGroupsModelName)
197+PlaceEntry::setEntryGroupsModelName(const QString& entryGroupsModelName)
198 {
199 if (entryGroupsModelName != m_entryGroupsModelName) {
200 m_entryGroupsModelName = entryGroupsModelName;
201@@ -622,7 +622,7 @@
202 }
203
204 void
205-PlaceEntry::setEntryResultsModelName(QString entryResultsModelName)
206+PlaceEntry::setEntryResultsModelName(const QString& entryResultsModelName)
207 {
208 if (entryResultsModelName != m_entryResultsModelName) {
209 m_entryResultsModelName = entryResultsModelName;
210@@ -647,14 +647,14 @@
211 }
212
213 void
214-PlaceEntry::setEntryRendererHints(QMap<QString, QVariant> entryRendererHints)
215+PlaceEntry::setEntryRendererHints(const QMap<QString, QVariant>& entryRendererHints)
216 {
217 m_entryRendererHints = entryRendererHints;
218 Q_EMIT entryRendererHintsChanged();
219 }
220
221 void
222-PlaceEntry::setGlobalSearchQuery(QString globalSearchQuery)
223+PlaceEntry::setGlobalSearchQuery(const QString& globalSearchQuery)
224 {
225 if (globalSearchQuery != m_globalSearchQuery) {
226 m_globalSearchQuery = globalSearchQuery;
227@@ -667,7 +667,7 @@
228 }
229
230 void
231-PlaceEntry::setGlobalRendererName(QString globalRendererName)
232+PlaceEntry::setGlobalRendererName(const QString& globalRendererName)
233 {
234 if (globalRendererName != m_globalRendererName) {
235 m_globalRendererName = globalRendererName;
236@@ -676,7 +676,7 @@
237 }
238
239 void
240-PlaceEntry::setGlobalGroupsModelName(QString globalGroupsModelName)
241+PlaceEntry::setGlobalGroupsModelName(const QString& globalGroupsModelName)
242 {
243 if (globalGroupsModelName != m_globalGroupsModelName) {
244 m_globalGroupsModelName = globalGroupsModelName;
245@@ -701,7 +701,7 @@
246 }
247
248 void
249-PlaceEntry::setGlobalResultsModelName(QString globalResultsModelName)
250+PlaceEntry::setGlobalResultsModelName(const QString& globalResultsModelName)
251 {
252 if (globalResultsModelName != m_globalResultsModelName) {
253 m_globalResultsModelName = globalResultsModelName;
254@@ -726,7 +726,7 @@
255 }
256
257 void
258-PlaceEntry::setGlobalRendererHints(QMap<QString, QVariant> globalRendererHints)
259+PlaceEntry::setGlobalRendererHints(const QMap<QString, QVariant>& globalRendererHints)
260 {
261 m_globalRendererHints = globalRendererHints;
262 Q_EMIT globalRendererHintsChanged();
263
264=== modified file 'libunity-2d-private/src/placeentry.h'
265--- libunity-2d-private/src/placeentry.h 2011-08-23 17:46:06 +0000
266+++ libunity-2d-private/src/placeentry.h 2012-01-13 15:33:01 +0000
267@@ -148,39 +148,37 @@
268 QMap<QString, QVariant> globalRendererHints() const;
269
270 /* setters */
271- /* FIXME: all setters of type QString should be optimized
272- by having the argument as cont QString& */
273- void setName(QString);
274- void setIcon(QString);
275- void setFileName(QString);
276- void setGroupName(QString);
277- void setDbusName(QString);
278- void setDbusObjectPath(QString);
279+ void setName(const QString &);
280+ void setIcon(const QString &);
281+ void setFileName(const QString &);
282+ void setGroupName(const QString &);
283+ void setDbusName(const QString &);
284+ void setDbusObjectPath(const QString &);
285 void setPosition(uint);
286- void setMimetypes(QStringList);
287+ void setMimetypes(const QStringList &);
288 void setSensitive(bool);
289 void setSections(DeeListModel*);
290- void setHints(QMap<QString, QVariant>);
291+ void setHints(const QMap<QString, QVariant> &);
292 void setSearchHint(const QString&);
293 void setShowEntry(bool);
294 void setActiveSection(int);
295 void setActive(bool);
296
297- void setEntrySearchQuery(QString);
298- void setEntryRendererName(QString);
299- void setEntryGroupsModelName(QString);
300+ void setEntrySearchQuery(const QString &);
301+ void setEntryRendererName(const QString &);
302+ void setEntryGroupsModelName(const QString &);
303 void setEntryGroupsModel(DeeListModel*);
304- void setEntryResultsModelName(QString);
305+ void setEntryResultsModelName(const QString &);
306 void setEntryResultsModel(DeeListModel*);
307- void setEntryRendererHints(QMap<QString, QVariant>);
308+ void setEntryRendererHints(const QMap<QString, QVariant> &);
309
310- void setGlobalSearchQuery(QString);
311- void setGlobalRendererName(QString);
312- void setGlobalGroupsModelName(QString);
313+ void setGlobalSearchQuery(const QString &);
314+ void setGlobalRendererName(const QString &);
315+ void setGlobalGroupsModelName(const QString &);
316 void setGlobalGroupsModel(DeeListModel*);
317- void setGlobalResultsModelName(QString);
318+ void setGlobalResultsModelName(const QString &);
319 void setGlobalResultsModel(DeeListModel*);
320- void setGlobalRendererHints(QMap<QString, QVariant>);
321+ void setGlobalRendererHints(const QMap<QString, QVariant>&);
322
323 /* methods */
324 Q_INVOKABLE virtual void activate();
325
326=== modified file 'libunity-2d-private/src/windowimageprovider.cpp'
327--- libunity-2d-private/src/windowimageprovider.cpp 2011-12-15 12:06:44 +0000
328+++ libunity-2d-private/src/windowimageprovider.cpp 2012-01-13 15:33:01 +0000
329@@ -170,7 +170,7 @@
330 into a QImage (since we use the rester paint engine). This conversion will
331 throw std::bad_alloc if the drawable is not valid, so we need to catch it.
332 */
333-QImage WindowImageProvider::convertWindowPixmap(QPixmap windowPixmap,
334+QImage WindowImageProvider::convertWindowPixmap(const QPixmap& windowPixmap,
335 Window frameWindowId)
336 {
337 if (m_x11supportsShape) {
338
339=== modified file 'libunity-2d-private/src/windowimageprovider.h'
340--- libunity-2d-private/src/windowimageprovider.h 2011-07-29 13:49:34 +0000
341+++ libunity-2d-private/src/windowimageprovider.h 2012-01-13 15:33:01 +0000
342@@ -33,7 +33,7 @@
343
344 private:
345 QPixmap getWindowPixmap(Window frameWindowId, Window contentWindowId);
346- QImage convertWindowPixmap(QPixmap windowPixmap, Window frameWindowId);
347+ QImage convertWindowPixmap(const QPixmap& windowPixmap, Window frameWindowId);
348
349 bool m_x11supportsShape;
350 };
351
352=== modified file 'panel/applets/legacytray/x11embedcontainer.cpp'
353--- panel/applets/legacytray/x11embedcontainer.cpp 2011-06-22 14:49:34 +0000
354+++ panel/applets/legacytray/x11embedcontainer.cpp 2012-01-13 15:33:01 +0000
355@@ -252,7 +252,7 @@
356 }
357 }
358
359-void X11EmbedContainer::setBackgroundPixmap(QPixmap background)
360+void X11EmbedContainer::setBackgroundPixmap(const QPixmap& background)
361 {
362 if (!clientWinId()) {
363 return;
364
365=== modified file 'panel/applets/legacytray/x11embedcontainer.h'
366--- panel/applets/legacytray/x11embedcontainer.h 2011-06-22 14:49:34 +0000
367+++ panel/applets/legacytray/x11embedcontainer.h 2012-01-13 15:33:01 +0000
368@@ -38,7 +38,7 @@
369
370 void embedSystemTrayClient(WId id);
371 void setUpdatesEnabled(bool enabled);
372- void setBackgroundPixmap(QPixmap background);
373+ void setBackgroundPixmap(const QPixmap& background);
374
375 protected:
376 void paintEvent(QPaintEvent *event);

Subscribers

People subscribed via source and target branches