diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:59:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:59:40 -0600 |
| commit | 59a076e9336f1eebda8650437e6bc61077be1516 (patch) | |
| tree | a2e4658f80b77270d84b50bd116f84eaea7efab0 /amor | |
| parent | 3ee504ecba6caf3c2609a8648fe3659f2b541544 (diff) | |
| download | tdetoys-59a076e9336f1eebda8650437e6bc61077be1516.tar.gz tdetoys-59a076e9336f1eebda8650437e6bc61077be1516.zip | |
Remove additional unneeded tq method conversions
Diffstat (limited to 'amor')
| -rw-r--r-- | amor/amor.cpp | 2 | ||||
| -rw-r--r-- | amor/amorbubble.cpp | 8 | ||||
| -rw-r--r-- | amor/amorbubble.h | 4 | ||||
| -rw-r--r-- | amor/amorwidget.cpp | 2 | ||||
| -rw-r--r-- | amor/amorwidget.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/amor/amor.cpp b/amor/amor.cpp index a9a73e3..7e8202b 100644 --- a/amor/amor.cpp +++ b/amor/amor.cpp @@ -748,7 +748,7 @@ void Amor::slotOffsetChanged(int off) // void Amor::slotAbout() { - TQString about = i18n("Amor Version %1\n\n").tqarg(AMOR_VERSION) + + TQString about = i18n("Amor Version %1\n\n").arg(AMOR_VERSION) + i18n("Amusing Misuse Of Resources\n\n") + i18n("Copyright (c) 1999 Martin R. Jones <mjones@kde.org>\n\n") + i18n("Original Author: Martin R. Jones <mjones@kde.org>\n") + diff --git a/amor/amorbubble.cpp b/amor/amorbubble.cpp index 5060f97..0af3c90 100644 --- a/amor/amorbubble.cpp +++ b/amor/amorbubble.cpp @@ -83,12 +83,12 @@ AmorBubble::~AmorBubble() //--------------------------------------------------------------------------- // -// Set the message to display in the bubble. Causes the tqgeometry of the +// Set the message to display in the bubble. Causes the geometry of the // widget to be recalculated. // void AmorBubble::setMessage(const TQString& message) { - mMessage = TQString( "<html>%1</html>" ).tqarg( message ); + mMessage = TQString( "<html>%1</html>" ).arg( message ); // hacks because heightForWidth() doesn't work. setGeometry( -1000, 0, 300, 1000 ); show(); @@ -108,7 +108,7 @@ void AmorBubble::calcGeometry() mBound.setHeight( mBrowser->contentsHeight() ); mBound.moveBy(ARROW_WIDTH+BORDER_SIZE, BORDER_SIZE); - // initialise the default tqgeometry of the bubble + // initialise the default geometry of the bubble int w = mBound.width() + BORDER_SIZE * 2 + ARROW_WIDTH; int h = mBound.height() + BORDER_SIZE * 2; int xpos = mOriginX + BUBBLE_OFFSET; @@ -141,7 +141,7 @@ void AmorBubble::calcGeometry() setGeometry(xpos, ypos, w, h); mBrowser->setGeometry( mBound ); - // create and apply the tqshape mask + // create and apply the shape mask mMask.resize(w, h); mMask.fill(color0); TQPainter maskPainter(&mMask); diff --git a/amor/amorbubble.h b/amor/amorbubble.h index 54e8912..f55cbd2 100644 --- a/amor/amorbubble.h +++ b/amor/amorbubble.h @@ -40,7 +40,7 @@ class TQTimer; //--------------------------------------------------------------------------- // -// AmorBubble displays a message in a tqshaped window +// AmorBubble displays a message in a shaped window // class AmorBubble : public TQWidget { @@ -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 mask + TQBitmap mMask; // shape 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 e5cc7b0..38dd0d3 100644 --- a/amor/amorwidget.cpp +++ b/amor/amorwidget.cpp @@ -64,7 +64,7 @@ void AmorWidget::setPixmap(const TQPixmap *pixmap) { XShapeCombineMask( x11Display(), winId(), ShapeBounding, 0, 0, mPixmap->mask()->handle(), ShapeSet ); - tqrepaint(false); + repaint(false); } update(); diff --git a/amor/amorwidget.h b/amor/amorwidget.h index 15f9126..3b46d4b 100644 --- a/amor/amorwidget.h +++ b/amor/amorwidget.h @@ -36,7 +36,7 @@ //--------------------------------------------------------------------------- // -// AmorWidget displays a tqshaped pixmap +// AmorWidget displays a shaped pixmap // class AmorWidget : public TQWidget { |