diff options
Diffstat (limited to 'amor')
| -rw-r--r-- | amor/amor.cpp | 14 | ||||
| -rw-r--r-- | amor/amorbubble.cpp | 4 | ||||
| -rw-r--r-- | amor/amorbubble.h | 2 | ||||
| -rw-r--r-- | amor/amorwidget.cpp | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/amor/amor.cpp b/amor/amor.cpp index fafee0c..2efb896 100644 --- a/amor/amor.cpp +++ b/amor/amor.cpp @@ -562,14 +562,14 @@ void Amor::restack() #endif Window sibling = mTargetWin; - Window dw, tqparent = None, *wins; + Window dw, parent = None, *wins; do { unsigned int nwins = 0; - // We must use the target window's tqparent as our sibling. - // Is there a faster way to get tqparent window than XQueryTree? - if (XQueryTree(qt_xdisplay(), sibling, &dw, &tqparent, &wins, &nwins)) + // We must use the target window's parent as our sibling. + // Is there a faster way to get parent window than XQueryTree? + if (XQueryTree(qt_xdisplay(), sibling, &dw, &parent, &wins, &nwins)) { if (nwins) { @@ -577,9 +577,9 @@ void Amor::restack() } } - if (tqparent != None && tqparent != dw ) - sibling = tqparent; - } while ( tqparent != None && tqparent != dw ); + if (parent != None && parent != dw ) + sibling = parent; + } while ( parent != None && parent != dw ); // Set animation's stacking order to be above the window manager's // decoration of target window. diff --git a/amor/amorbubble.cpp b/amor/amorbubble.cpp index 2860ccd..49e65b7 100644 --- a/amor/amorbubble.cpp +++ b/amor/amorbubble.cpp @@ -99,7 +99,7 @@ void AmorBubble::setMessage(const TQString& message) //--------------------------------------------------------------------------- // -// Calculates the size, position and tqmask of the bubble +// Calculates the size, position and mask of the bubble // void AmorBubble::calcGeometry() { @@ -141,7 +141,7 @@ void AmorBubble::calcGeometry() setGeometry(xpos, ypos, w, h); mBrowser->setGeometry( mBound ); - // create and apply the tqshape tqmask + // create and apply the tqshape mask mMask.resize(w, h); mMask.fill(color0); TQPainter maskPainter(&mMask); diff --git a/amor/amorbubble.h b/amor/amorbubble.h index 408c568..54e8912 100644 --- a/amor/amorbubble.h +++ b/amor/amorbubble.h @@ -70,7 +70,7 @@ protected: int mOriginX; // X origin of bubble arrow int mOriginY; // Y origin of bubble arrow TQRect mBound; // bounds of the text - TQBitmap mMask; // tqshape tqmask + TQBitmap mMask; // tqshape mask VertPos mArrowVert; // vertical position of the arrow HorzPos mArrowHorz; // horizontal position of the arrow TQTextBrowser *mBrowser; // displays the message diff --git a/amor/amorwidget.cpp b/amor/amorwidget.cpp index b64af77..e5cc7b0 100644 --- a/amor/amorwidget.cpp +++ b/amor/amorwidget.cpp @@ -60,10 +60,10 @@ void AmorWidget::setPixmap(const TQPixmap *pixmap) if (mPixmap) { - if (mPixmap->tqmask()) + if (mPixmap->mask()) { XShapeCombineMask( x11Display(), winId(), ShapeBounding, 0, 0, - mPixmap->tqmask()->handle(), ShapeSet ); + mPixmap->mask()->handle(), ShapeSet ); tqrepaint(false); } |