From 7b3340bcceb797ac1dee8be4359bef69a8f19bad Mon Sep 17 00:00:00 2001 From: Jekyll Wu Date: Sat, 24 Mar 2012 20:57:10 +0800 Subject: [PATCH] Rename and add more constness --- src/ViewSplitter.cpp | 16 ++++++++-------- src/ViewSplitter.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ViewSplitter.cpp b/src/ViewSplitter.cpp index 75e5ad6fe..56eca3f2e 100644 --- a/src/ViewSplitter.cpp +++ b/src/ViewSplitter.cpp @@ -52,10 +52,10 @@ void ViewSplitter::adjustContainerSize(ViewContainer* container , int percentage QList containerSizes = sizes(); - int oldSize = containerSizes[containerIndex]; - int newSize = (int)(oldSize * (1.0 + percentage / 100.0)); + const int oldSize = containerSizes[containerIndex]; + const int newSize = (int)(oldSize * (1.0 + percentage / 100.0)); - int perContainerDelta = (count() == 1) ? 0 : ((newSize - oldSize) / (count() - 1)) * (-1); + const int perContainerDelta = (count() == 1) ? 0 : ((newSize - oldSize) / (count() - 1)) * (-1); for (int i = 0 ; i < containerSizes.count() ; i++) { if (i == containerIndex) @@ -148,7 +148,7 @@ void ViewSplitter::addContainer(ViewContainer* container , connect(newSplitter , SIGNAL(empty(ViewSplitter*)) , splitter , SLOT(childEmpty(ViewSplitter*))); ViewContainer* oldContainer = splitter->activeContainer(); - int oldContainerIndex = splitter->indexOf(oldContainer->containerWidget()); + const int oldContainerIndex = splitter->indexOf(oldContainer->containerWidget()); splitter->unregisterContainer(oldContainer); @@ -166,7 +166,7 @@ void ViewSplitter::addContainer(ViewContainer* container , } -void ViewSplitter::containerEmpty(ViewContainer* /*object*/) +void ViewSplitter::containerEmpty(ViewContainer* /*container*/) { int children = 0; foreach ( ViewContainer* container, _containers ) { @@ -177,11 +177,11 @@ void ViewSplitter::containerEmpty(ViewContainer* /*object*/) emit allContainersEmpty(); } -void ViewSplitter::containerDestroyed(ViewContainer* object) +void ViewSplitter::containerDestroyed(ViewContainer* container) { - Q_ASSERT(_containers.contains(object)); + Q_ASSERT(_containers.contains(container)); - _containers.removeAll(object); + _containers.removeAll(container); if (count() == 0) { emit empty(this); diff --git a/src/ViewSplitter.h b/src/ViewSplitter.h index 0032523e4..24b1f7085 100644 --- a/src/ViewSplitter.h +++ b/src/ViewSplitter.h @@ -172,10 +172,10 @@ private: private slots: // Called to indicate that a child ViewContainer has been deleted - void containerDestroyed(ViewContainer* object); + void containerDestroyed(ViewContainer* container); // Called to indicate that a child ViewContainer is empty - void containerEmpty(ViewContainer* object); + void containerEmpty(ViewContainer* container); // Called to indicate that a child ViewSplitter is empty // (ie. all child widgets have been deleted)