From 1c709a17fd50643587ca89ce30c0faf8e0573e6e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Tue, 17 May 2011 11:23:10 +0200 Subject: [PATCH] Pass QList as const reference when possible Avoids some reference counting. Reviewed-by: Kai Koehne Change-Id: I4de83aa4df6833fa2287ac1854bbb0052d15cee9 (cherry picked from commit bdd8f188ac352c99ee218318a59089f387a31d60) --- .../qdeclarativeviewobserver.cpp | 9 +++++---- .../qdeclarativeviewobserver_p.h | 2 +- .../qdeclarativeviewobserver_p_p.h | 7 ++++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver.cpp b/src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver.cpp index 41346ff..5d2ab09 100644 --- a/src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver.cpp +++ b/src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver.cpp @@ -557,7 +557,7 @@ void QDeclarativeViewObserverPrivate::changeTool(Constants::DesignTool tool, } } -void QDeclarativeViewObserverPrivate::setSelectedItemsForTools(QList items) +void QDeclarativeViewObserverPrivate::setSelectedItemsForTools(const QList &items) { foreach (const QWeakPointer &obj, currentSelection) { if (QGraphicsItem *item = obj.data()) { @@ -582,7 +582,7 @@ void QDeclarativeViewObserverPrivate::setSelectedItemsForTools(QListupdateSelectedItems(); } -void QDeclarativeViewObserverPrivate::setSelectedItems(QList items) +void QDeclarativeViewObserverPrivate::setSelectedItems(const QList &items) { QList > oldList = currentSelection; setSelectedItemsForTools(items); @@ -633,7 +633,8 @@ void QDeclarativeViewObserverPrivate::highlight(QGraphicsObject * item, ContextF highlight(QList() << item, flags); } -void QDeclarativeViewObserverPrivate::highlight(QList items, ContextFlags flags) +void QDeclarativeViewObserverPrivate::highlight(const QList &items, + ContextFlags flags) { if (items.isEmpty()) return; @@ -1064,7 +1065,7 @@ void QDeclarativeViewObserver::sendDesignModeBehavior(bool inDesignMode) data->debugService->sendMessage(message); } -void QDeclarativeViewObserver::sendCurrentObjects(QList objects) +void QDeclarativeViewObserver::sendCurrentObjects(const QList &objects) { QByteArray message; QDataStream ds(&message, QIODevice::WriteOnly); diff --git a/src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver_p.h b/src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver_p.h index 4d66cae..86d0d95 100644 --- a/src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver_p.h +++ b/src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver_p.h @@ -78,7 +78,7 @@ public: bool showAppOnTop() const; void sendDesignModeBehavior(bool inDesignMode); - void sendCurrentObjects(QList items); + void sendCurrentObjects(const QList &); void sendAnimationSpeed(qreal slowDownFactor); void sendAnimationPaused(bool paused); void sendCurrentTool(Constants::DesignTool toolId); diff --git a/src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver_p_p.h b/src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver_p_p.h index 57dae45..8809591 100644 --- a/src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver_p_p.h +++ b/src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver_p_p.h @@ -117,15 +117,16 @@ public: QList selectableItems(const QPointF &scenePos) const; QList selectableItems(const QRectF &sceneRect, Qt::ItemSelectionMode selectionMode) const; - void setSelectedItemsForTools(QList items); - void setSelectedItems(QList items); + void setSelectedItemsForTools(const QList &items); + void setSelectedItems(const QList &items); QList selectedItems() const; void changeTool(Constants::DesignTool tool, Constants::ToolFlags flags = Constants::NoToolFlags); void clearHighlight(); - void highlight(QList item, ContextFlags flags = ContextSensitive); + void highlight(const QList &item, + ContextFlags flags = ContextSensitive); void highlight(QGraphicsObject *item, ContextFlags flags = ContextSensitive); bool mouseInsideContextItem() const; -- 1.7.2.5