From 19e6866bb87eaed19b36ebca1bf9448f6bd6ecb8 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 27 Aug 2012 15:27:40 +0200 Subject: [PATCH] CComponentsItemBox: use plausible member names --- src/gui/components/cc.h | 4 ++-- src/gui/components/components.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/components/cc.h b/src/gui/components/cc.h index 4d2585fe0..5c071f966 100644 --- a/src/gui/components/cc.h +++ b/src/gui/components/cc.h @@ -343,8 +343,8 @@ class CComponentsItemBox : public CComponentsContainer void clearElements(); void paintPic(CComponentsPicture* pic); void initVarItemBox(); - void calculateElementsInitPart1(); - void calculateElementsInitPart2(); + void calSizeOfElements(); + void calPositionOfElements(); public: CComponentsItemBox(); diff --git a/src/gui/components/components.cpp b/src/gui/components/components.cpp index 409c5161b..9fcce99cc 100644 --- a/src/gui/components/components.cpp +++ b/src/gui/components/components.cpp @@ -943,7 +943,7 @@ bool CComponentsItemBox::addElement(int align, int type, const std::string& elem return true; } -void CComponentsItemBox::calculateElementsInitPart1() +void CComponentsItemBox::calSizeOfElements() { size_t i; @@ -995,7 +995,7 @@ void CComponentsItemBox::calculateElementsInitPart1() } } -void CComponentsItemBox::calculateElementsInitPart2() +void CComponentsItemBox::calPositionOfElements() { size_t i; @@ -1152,7 +1152,7 @@ void CComponentsTitleBar::calculateElements() size_t i; - calculateElementsInitPart1(); + calSizeOfElements(); // hMax correction if no text element. if (!has_TextElement) @@ -1184,5 +1184,5 @@ void CComponentsTitleBar::calculateElements() } } - calculateElementsInitPart2(); + calPositionOfElements(); }