diff options
Diffstat (limited to 'amor')
| -rw-r--r-- | amor/amor.cpp | 6 | ||||
| -rw-r--r-- | amor/amoranim.cpp | 4 | ||||
| -rw-r--r-- | amor/amoranim.h | 4 | ||||
| -rw-r--r-- | amor/amorbubble.cpp | 12 | ||||
| -rw-r--r-- | amor/amorbubble.h | 4 | ||||
| -rw-r--r-- | amor/amorwidget.cpp | 2 | ||||
| -rw-r--r-- | amor/amorwidget.h | 2 |
7 files changed, 17 insertions, 17 deletions
diff --git a/amor/amor.cpp b/amor/amor.cpp index 0a9b436..7e8202b 100644 --- a/amor/amor.cpp +++ b/amor/amor.cpp @@ -152,7 +152,7 @@ Amor::Amor() : DCOPObject( "AmorIface" ), TQObject() TQT_SLOT(slotMouseClicked(const TQPoint &))); connect(mAmor, TQT_SIGNAL(dragged(const TQPoint &, bool)), TQT_SLOT(slotWidgetDragged(const TQPoint &, bool))); - mAmor->resize(mTheme.tqmaximumSize()); + mAmor->resize(mTheme.maximumSize()); mTimer = new TQTimer(this); connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); @@ -288,7 +288,7 @@ void Amor::reset() mPosition = mCurrAnim->hotspot().x(); mState = Normal; - mAmor->resize(mTheme.tqmaximumSize()); + mAmor->resize(mTheme.maximumSize()); mCurrAnim->reset(); mTimer->start(0, true); @@ -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/amoranim.cpp b/amor/amoranim.cpp index 31b4f6f..b4e595b 100644 --- a/amor/amoranim.cpp +++ b/amor/amoranim.cpp @@ -227,7 +227,7 @@ bool AmorThemeManager::readGroup(const TQString & seq) mConfig->setGroup(list.at(i)); AmorAnim *anim = new AmorAnim(*mConfig); animList->append(anim); - mMaximumSize = mMaximumSize.expandedTo(anim->tqmaximumSize()); + mMaximumSize = mMaximumSize.expandedTo(anim->maximumSize()); } // If no animations were available for this group, just add the base anim @@ -238,7 +238,7 @@ bool AmorThemeManager::readGroup(const TQString & seq) if (anim) { animList->append(anim); - mMaximumSize = mMaximumSize.expandedTo(anim->tqmaximumSize()); + mMaximumSize = mMaximumSize.expandedTo(anim->maximumSize()); entries++; } } diff --git a/amor/amoranim.h b/amor/amoranim.h index d315840..acc4fba 100644 --- a/amor/amoranim.h +++ b/amor/amoranim.h @@ -59,7 +59,7 @@ public: { return (mCurrent < mSequence.count()); } int totalMovement() const { return mTotalMovement; } - TQSize tqmaximumSize() const + TQSize maximumSize() const { return mMaximumSize; } int delay() const @@ -103,7 +103,7 @@ public: AmorAnim *random(const TQString & group); - TQSize tqmaximumSize() const { return mMaximumSize; } + TQSize maximumSize() const { return mMaximumSize; } protected: TQString mPath; diff --git a/amor/amorbubble.cpp b/amor/amorbubble.cpp index 49e65b7..0af3c90 100644 --- a/amor/amorbubble.cpp +++ b/amor/amorbubble.cpp @@ -55,7 +55,7 @@ AmorBubble::AmorBubble() mBrowser->setWrapPolicy(TQTextEdit::AtWordOrDocumentBoundary); // too long to fit in one line? - TQColorGroup clgrp = mBrowser->tqcolorGroup(); + TQColorGroup clgrp = mBrowser->colorGroup(); clgrp.setColor(TQColorGroup::Text, TQt::black); //Laurent TQTextBrowser didn't have this function FIX me //mBrowser->setPaperColorGroup( clgrp ); @@ -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); @@ -195,7 +195,7 @@ void AmorBubble::drawBubble(TQPainter &p) p.drawPolygon(pointArray); p.setPen(pen); - p.tqdrawPolyline(pointArray, 0, 3); + p.drawPolyline(pointArray, 0, 3); } //--------------------------------------------------------------------------- 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 { |