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

List:       kde-commits
Subject:    kdebase/kicker/core
From:       Wilco Greven <greven () kde ! org>
Date:       2003-10-16 20:03:47
[Download RAW message or body]

CVS commit by wgreven: 

No need for the flag _movingAC. When a container is being moved, _moveAC != 0.


  M +2 -5      containerarea.cpp   1.156
  M +2 -4      containerarea.h   1.59


--- kdebase/kicker/core/containerarea.cpp  #1.155:1.156
@@ -69,5 +69,4 @@ ContainerArea::ContainerArea( KConfig* _
     : Panner( parent, name )
     , _block_relayout(false)
-    , _movingAC(false)
     , _moveAC(0)
     , _pos(::Left)
@@ -578,5 +577,4 @@ void ContainerArea::startContainerMove(B
 
     _moveAC = a;
-    _movingAC = true;
 
     if(_moveAC->inherits("ButtonContainer")) {
@@ -599,5 +597,4 @@ void ContainerArea::stopContainerMove(Ba
     releaseMouse();
     setCursor(arrowCursor);
-    _movingAC = false;
     setMouseTracking(false);
 
@@ -618,5 +615,5 @@ void ContainerArea::stopContainerMove(Ba
 void ContainerArea::mouseReleaseEvent(QMouseEvent *)
 {
-    if (_movingAC && _moveAC)
+    if (_moveAC)
         stopContainerMove(_moveAC);
 }
@@ -624,5 +621,5 @@ void ContainerArea::mouseReleaseEvent(QM
 void ContainerArea::mouseMoveEvent(QMouseEvent *ev)
 {
-    if (!(_movingAC && _moveAC)) {
+    if (!_moveAC) {
         Panner::mouseMoveEvent(ev);
         return;

--- kdebase/kicker/core/containerarea.h  #1.58:1.59
@@ -71,5 +71,5 @@ public:
     void configure();
 
-    bool inMoveOperation() const { return _movingAC; }
+    bool inMoveOperation() const { return (_moveAC != 0); }
     int minimumUsedSpace( Orientation, int width, int height ) const;
 
@@ -148,5 +147,4 @@ private:
 
     bool            _block_relayout;
-    bool            _movingAC;
     BaseContainer*  _moveAC;
     Position        _pos;
@@ -155,8 +153,8 @@ private:
     BaseContainer*  _dragMoveAC;
     QPoint          _dragMoveOffset;
-    QTimer          _autoScrollTimer;
     QPopupMenu*     _opMenu;
     KRootPixmap*    _rootPixmap;
     bool            _transparent;
+    QTimer          _autoScrollTimer;
 };
 


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