diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-22 21:31:21 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-22 21:31:21 +0000 |
| commit | a1bd60b34891ccc77056c190d7871bc4b14fe654 (patch) | |
| tree | 713f2f72c8f08a18df12f5bbeef7f9b61b19d4f1 /amor/amorwidget.cpp | |
| parent | 8d92c3c2a4131996726cc7b625d3cd3caec296de (diff) | |
| download | tdetoys-a1bd60b34891ccc77056c190d7871bc4b14fe654.tar.gz tdetoys-a1bd60b34891ccc77056c190d7871bc4b14fe654.zip | |
TQt4 port kdetoys
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdetoys@1238103 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'amor/amorwidget.cpp')
| -rw-r--r-- | amor/amorwidget.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/amor/amorwidget.cpp b/amor/amorwidget.cpp index c659af2..b64af77 100644 --- a/amor/amorwidget.cpp +++ b/amor/amorwidget.cpp @@ -60,11 +60,11 @@ void AmorWidget::setPixmap(const TQPixmap *pixmap) if (mPixmap) { - if (mPixmap->mask()) + if (mPixmap->tqmask()) { XShapeCombineMask( x11Display(), winId(), ShapeBounding, 0, 0, - mPixmap->mask()->handle(), ShapeSet ); - repaint(false); + mPixmap->tqmask()->handle(), ShapeSet ); + tqrepaint(false); } update(); @@ -98,7 +98,7 @@ void AmorWidget::mousePressEvent(TQMouseEvent *me) // void AmorWidget::mouseMoveEvent(TQMouseEvent *me) { - if ( me->state() == LeftButton ) { + if ( me->state() == Qt::LeftButton ) { if ( !dragging && (clickPos-me->globalPos()).manhattanLength() > 3 ) dragging = true; if ( dragging ) { @@ -116,7 +116,7 @@ void AmorWidget::mouseReleaseEvent(TQMouseEvent *me) { if ( dragging ) emit dragged( me->globalPos() - clickPos, true ); - else if ( me->state() == RightButton ) + else if ( me->state() == Qt::RightButton ) emit mouseClicked(clickPos); clickPos = TQPoint(); |