[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/apps/dolphin/src
From:       Rafael Fernández López <ereslibre () kde ! org>
Date:       2010-03-15 10:08:33
Message-ID: 1268647713.111457.8161.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1103527 by ereslibre:

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.

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


 M  +2 -2      dolphincategorydrawer.cpp  
 M  +6 -12     dolphincategorydrawer.h  


--- trunk/KDE/kdebase/apps/dolphin/src/dolphincategorydrawer.cpp #1103526:1103527
@@ -286,7 +286,7 @@
     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();
@@ -319,7 +319,7 @@
     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();
--- trunk/KDE/kdebase/apps/dolphin/src/dolphincategorydrawer.h #1103526:1103527
@@ -31,6 +31,9 @@
     : public KCategoryDrawerV3
 {
 public:
+    using KCategoryDrawerV2::mouseButtonPressed;
+    using KCategoryDrawerV2::mouseButtonReleased;
+
     enum Action {
         SelectAll = 0,
         UnselectAll
@@ -49,19 +52,10 @@
 
     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);
+protected:
+    virtual void mouseButtonPressed(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);
+    virtual void mouseButtonReleased(const QModelIndex &index, const QRect &blockRect, QMouseEvent \
*event);  
     virtual void mouseMoved(const QModelIndex &index, const QRect &blockRect, QMouseEvent *event);
 


[prev in list] [next in list] [prev in thread] [next in thread]