Get back names, and use "using" keyword to keep GCC silent on "method foo on base...

CCMAIL: Woebbeking@kde.org
CCMAIL: peter.penz@gmx.at

svn path=/trunk/KDE/kdebase/apps/; revision=1103527

diff --git a/src/dolphincategorydrawer.cpp b/src/dolphincategorydrawer.cpp
index 303edf174950ac0d8ca9e214a4ea7e5b6fe97abb..59743b7f53e3166e5f502f6cbac537ea248352ad 100644 (file)
--- a/src/dolphincategorydrawer.cpp
+++ b/src/dolphincategorydrawer.cpp
@@ -286,7 +286,7 @@ int DolphinCategoryDrawer::categoryHeight(const QModelIndex &index, const QStyle
     return heightWithoutIcon + 5;
 }
 
     return heightWithoutIcon + 5;
 }
 

-void DolphinCategoryDrawer::buttonPressed(const QModelIndex &index, const QRect &blockRect, QMouseEvent *event)
+void DolphinCategoryDrawer::mouseButtonPressed(const QModelIndex &index, const QRect &blockRect, QMouseEvent *event)

 {
     if (!index.isValid()) {
         event->ignore();
 {
     if (!index.isValid()) {
         event->ignore();


@@ -319,7 +319,7 @@ void DolphinCategoryDrawer::buttonPressed(const QModelIndex &index, const QRect
     event->ignore();
 }
 
     event->ignore();
 }
 

-void DolphinCategoryDrawer::buttonReleased(const QModelIndex &index, const QRect &blockRect, QMouseEvent *event)
+void DolphinCategoryDrawer::mouseButtonReleased(const QModelIndex &index, const QRect &blockRect, QMouseEvent *event)

 {
     if (!index.isValid() || hotSpotPressed == NoneHotSpot || categoryPressed != index) {
         event->ignore();
 {
     if (!index.isValid() || hotSpotPressed == NoneHotSpot || categoryPressed != index) {
         event->ignore();

diff --git a/src/dolphincategorydrawer.h b/src/dolphincategorydrawer.h
index 38b0b33b2be759ce808bebccfb4bc03b47538abb..d9849727e788512960f83848a5c7fa10bb4ce06a 100644 (file)
--- a/src/dolphincategorydrawer.h
+++ b/src/dolphincategorydrawer.h
@@ -31,6 +31,9 @@ class LIBDOLPHINPRIVATE_EXPORT DolphinCategoryDrawer
     : public KCategoryDrawerV3
 {
 public:
     : public KCategoryDrawerV3
 {
 public:

+    using KCategoryDrawerV2::mouseButtonPressed;
+    using KCategoryDrawerV2::mouseButtonReleased;
+

     enum Action {
         SelectAll = 0,
         UnselectAll
     enum Action {
         SelectAll = 0,
         UnselectAll


@@ -49,19 +52,10 @@ public:
 
     virtual int categoryHeight(const QModelIndex &index, const QStyleOption &option) const;
 
 
     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);
 
 
     virtual void mouseMoved(const QModelIndex &index, const QRect &blockRect, QMouseEvent *event);