From 0a016406b4ac7a4f4ec107d99857f08e2ff5a39c Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 29 Nov 2014 20:08:16 +0000 Subject: [PATCH] Fixed Clang warning about hidden function name --- src/blackgui/views/viewbase.cpp | 4 ++-- src/blackgui/views/viewbase.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/blackgui/views/viewbase.cpp b/src/blackgui/views/viewbase.cpp index 65417991f..ce530e0ea 100644 --- a/src/blackgui/views/viewbase.cpp +++ b/src/blackgui/views/viewbase.cpp @@ -75,7 +75,7 @@ namespace BlackGui return h; } - void CViewBaseNonTemplate::standardInit() + void CViewBaseNonTemplate::init() { int fh = qRound(1.5 * this->getHorizontalHeaderFontHeight()); this->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive); // faster mode @@ -234,7 +234,7 @@ namespace BlackGui connect(this->m_model, &ModelClass::rowCountChanged, this, &CViewBase::countChanged); } this->setModel(this->m_model); // via QTableView - CViewBaseNonTemplate::standardInit(); + CViewBaseNonTemplate::init(); this->setSortIndicator(); } diff --git a/src/blackgui/views/viewbase.h b/src/blackgui/views/viewbase.h index 2e10cb941..62a82d1b5 100644 --- a/src/blackgui/views/viewbase.h +++ b/src/blackgui/views/viewbase.h @@ -110,7 +110,7 @@ namespace BlackGui virtual bool performResizing() const; //! Init default values - virtual void standardInit(); + void init(); ResizeMode m_resizeMode = ResizingAuto; //!< mode int m_resizeCount = 0; //!< flag / counter, how many resize activities