diff options
Diffstat (limited to 'kolourpaint/kpview.cpp')
| -rw-r--r-- | kolourpaint/kpview.cpp | 64 | 
1 files changed, 32 insertions, 32 deletions
| diff --git a/kolourpaint/kpview.cpp b/kolourpaint/kpview.cpp index c130c0d9..8447b966 100644 --- a/kolourpaint/kpview.cpp +++ b/kolourpaint/kpview.cpp @@ -122,7 +122,7 @@ kpView::kpView (kpDocument *document,      setBackgroundMode (TQt::NoBackground);  // no flicker -    setFocusPolicy (TQ_WheelFocus); +    setFocusPolicy (TQWidget::WheelFocus);      setMouseTracking (true);  // mouseMoveEvent's even when no mousebtn down      setKeyCompression (true);      setInputMethodEnabled (true);  // ensure using InputMethod @@ -297,55 +297,55 @@ void kpView::showBuddyViewScrollableContainerRectangle (bool yes)          // Got these connect statements by analysing deps of          // updateBuddyViewScrollableContainerRectangle() rect update code. -        connect (this, TQT_SIGNAL (zoomLevelChanged (int, int)), -                 this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); -        connect (this, TQT_SIGNAL (originChanged (const TQPoint &)), -                 this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); +        connect (this, TQ_SIGNAL (zoomLevelChanged (int, int)), +                 this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); +        connect (this, TQ_SIGNAL (originChanged (const TQPoint &)), +                 this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ()));          if (buddyViewScrollableContainer ())          { -            connect (buddyViewScrollableContainer (), TQT_SIGNAL (contentsMovingSoon (int, int)), -                     this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); -            connect (buddyViewScrollableContainer (), TQT_SIGNAL (resized ()), -                     this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); +            connect (buddyViewScrollableContainer (), TQ_SIGNAL (contentsMovingSoon (int, int)), +                     this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); +            connect (buddyViewScrollableContainer (), TQ_SIGNAL (resized ()), +                     this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ()));          }          if (buddyView ())          { -            connect (buddyView (), TQT_SIGNAL (zoomLevelChanged (int, int)), -                     this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); -            connect (buddyView (), TQT_SIGNAL (originChanged (const TQPoint &)), -                     this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); +            connect (buddyView (), TQ_SIGNAL (zoomLevelChanged (int, int)), +                     this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); +            connect (buddyView (), TQ_SIGNAL (originChanged (const TQPoint &)), +                     this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); -            connect (buddyView (), TQT_SIGNAL (sizeChanged (int, int)), -                     this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); +            connect (buddyView (), TQ_SIGNAL (sizeChanged (int, int)), +                     this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ()));          }      }      else      { -        disconnect (this, TQT_SIGNAL (zoomLevelChanged (int, int)), -                    this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); -        disconnect (this, TQT_SIGNAL (originChanged (const TQPoint &)), -                    this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); +        disconnect (this, TQ_SIGNAL (zoomLevelChanged (int, int)), +                    this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); +        disconnect (this, TQ_SIGNAL (originChanged (const TQPoint &)), +                    this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ()));          if (buddyViewScrollableContainer ())          { -            disconnect (buddyViewScrollableContainer (), TQT_SIGNAL (contentsMovingSoon (int, int)), -                        this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); -            disconnect (buddyViewScrollableContainer (), TQT_SIGNAL (resized ()), -                        this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); +            disconnect (buddyViewScrollableContainer (), TQ_SIGNAL (contentsMovingSoon (int, int)), +                        this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); +            disconnect (buddyViewScrollableContainer (), TQ_SIGNAL (resized ()), +                        this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ()));          }          if (buddyView ())          { -            disconnect (buddyView (), TQT_SIGNAL (zoomLevelChanged (int, int)), -                        this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); -            disconnect (buddyView (), TQT_SIGNAL (originChanged (const TQPoint &)), -                        this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); +            disconnect (buddyView (), TQ_SIGNAL (zoomLevelChanged (int, int)), +                        this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); +            disconnect (buddyView (), TQ_SIGNAL (originChanged (const TQPoint &)), +                        this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); -            disconnect (buddyView (), TQT_SIGNAL (sizeChanged (int, int)), -                        this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); +            disconnect (buddyView (), TQ_SIGNAL (sizeChanged (int, int)), +                        this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ()));          }      } @@ -969,7 +969,7 @@ void kpView::mouseMoveEvent (TQMouseEvent *e)      // TODO: This is wrong if you leaveEvent the mainView by mouseMoving on the      //       mainView, landing on top of the thumbnailView cleverly put on top      //       of the mainView. -    setHasMouse (TQT_TQRECT_OBJECT(rect ()).contains (e->pos ())); +    setHasMouse (rect ().contains (e->pos ()));      if (tool ())          tool ()->mouseMoveEvent (e); @@ -1003,7 +1003,7 @@ void kpView::mouseReleaseEvent (TQMouseEvent *e)                 << endl;  #endif -    setHasMouse (TQT_TQRECT_OBJECT(rect ()).contains (e->pos ())); +    setHasMouse (rect ().contains (e->pos ()));      if (tool ())          tool ()->mouseReleaseEvent (e); @@ -1343,7 +1343,7 @@ void kpView::paintEventDrawSelection (TQPixmap *destPixmap, const TQRect &docRec          destPixmapPainter.setRasterOp (TQt::XorROP);          destPixmapPainter.setPen (TQPen (TQt::white, 1, TQt::DotLine)); -        destPixmapPainter.setBackgroundMode (Qt::OpaqueMode); +        destPixmapPainter.setBackgroundMode (TQt::OpaqueMode);          destPixmapPainter.setBackgroundColor (TQt::blue);          TQBitmap maskBitmap; | 
