From 7eeb8dba6aeba09aa3dfa7fa5f0b00840d4d8317 Mon Sep 17 00:00:00 2001 From: Rafael Fernández López Date: Mon, 15 Mar 2010 10:08:32 +0000 Subject: Get back names, and use "using" keyword to keep GCC silent on "method foo on base class hidden y method foo on derived class". Thanks to André for pointing out this trick. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CCMAIL: Woebbeking@kde.org CCMAIL: peter.penz@gmx.at svn path=/trunk/KDE/kdebase/apps/; revision=1103527 --- src/dolphincategorydrawer.h | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'src/dolphincategorydrawer.h') diff --git a/src/dolphincategorydrawer.h b/src/dolphincategorydrawer.h index 38b0b33b2..d9849727e 100644 --- a/src/dolphincategorydrawer.h +++ b/src/dolphincategorydrawer.h @@ -31,6 +31,9 @@ class LIBDOLPHINPRIVATE_EXPORT DolphinCategoryDrawer : public KCategoryDrawerV3 { public: + using KCategoryDrawerV2::mouseButtonPressed; + using KCategoryDrawerV2::mouseButtonReleased; + enum Action { SelectAll = 0, UnselectAll @@ -49,19 +52,10 @@ public: virtual int categoryHeight(const QModelIndex &index, const QStyleOption &option) const; - /** - * @warning You explicitly have to determine whether the event has been accepted or not. You - * have to call event->accept() or event->ignore() at all possible case branches in - * your code. - */ - virtual void buttonPressed(const QModelIndex &index, const QRect &blockRect, QMouseEvent *event); - - /** - * @warning You explicitly have to determine whether the event has been accepted or not. You - * have to call event->accept() or event->ignore() at all possible case branches in - * your code. - */ - virtual void buttonReleased(const QModelIndex &index, const QRect &blockRect, QMouseEvent *event); +protected: + virtual void mouseButtonPressed(const QModelIndex &index, const QRect &blockRect, QMouseEvent *event); + + virtual void mouseButtonReleased(const QModelIndex &index, const QRect &blockRect, QMouseEvent *event); virtual void mouseMoved(const QModelIndex &index, const QRect &blockRect, QMouseEvent *event); -- cgit v1.3