summaryrefslogtreecommitdiffstats
path: root/amor
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 10:00:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 10:00:14 -0600
commit4d75f93557ba631d97a56e288a34ca27f4507653 (patch)
tree9c6aa673bd4900debf335044852a99b4d9f67133 /amor
parent6cdf35ab11c322f33feca5baf090ef56068b6049 (diff)
downloadtdetoys-4d75f93557ba631d97a56e288a34ca27f4507653.tar.gz
tdetoys-4d75f93557ba631d97a56e288a34ca27f4507653.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 6cdf35ab11c322f33feca5baf090ef56068b6049.
Diffstat (limited to 'amor')
-rw-r--r--amor/amor.cpp6
-rw-r--r--amor/amoranim.cpp4
-rw-r--r--amor/amoranim.h4
-rw-r--r--amor/amorbubble.cpp12
-rw-r--r--amor/amorbubble.h4
-rw-r--r--amor/amorwidget.cpp2
-rw-r--r--amor/amorwidget.h2
7 files changed, 17 insertions, 17 deletions
diff --git a/amor/amor.cpp b/amor/amor.cpp
index 7e8202b..0a9b436 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.maximumSize());
+ mAmor->resize(mTheme.tqmaximumSize());
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.maximumSize());
+ mAmor->resize(mTheme.tqmaximumSize());
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").arg(AMOR_VERSION) +
+ TQString about = i18n("Amor Version %1\n\n").tqarg(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 b4e595b..31b4f6f 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->maximumSize());
+ mMaximumSize = mMaximumSize.expandedTo(anim->tqmaximumSize());
}
// 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->maximumSize());
+ mMaximumSize = mMaximumSize.expandedTo(anim->tqmaximumSize());
entries++;
}
}
diff --git a/amor/amoranim.h b/amor/amoranim.h
index acc4fba..d315840 100644
--- a/amor/amoranim.h
+++ b/amor/amoranim.h
@@ -59,7 +59,7 @@ public:
{ return (mCurrent < mSequence.count()); }
int totalMovement() const
{ return mTotalMovement; }
- TQSize maximumSize() const
+ TQSize tqmaximumSize() const
{ return mMaximumSize; }
int delay() const
@@ -103,7 +103,7 @@ public:
AmorAnim *random(const TQString & group);
- TQSize maximumSize() const { return mMaximumSize; }
+ TQSize tqmaximumSize() const { return mMaximumSize; }
protected:
TQString mPath;
diff --git a/amor/amorbubble.cpp b/amor/amorbubble.cpp
index 0af3c90..49e65b7 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->colorGroup();
+ TQColorGroup clgrp = mBrowser->tqcolorGroup();
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 geometry of the
+// Set the message to display in the bubble. Causes the tqgeometry of the
// widget to be recalculated.
//
void AmorBubble::setMessage(const TQString& message)
{
- mMessage = TQString( "<html>%1</html>" ).arg( message );
+ mMessage = TQString( "<html>%1</html>" ).tqarg( 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 geometry of the bubble
+ // initialise the default tqgeometry 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 shape mask
+ // create and apply the tqshape 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.drawPolyline(pointArray, 0, 3);
+ p.tqdrawPolyline(pointArray, 0, 3);
}
//---------------------------------------------------------------------------
diff --git a/amor/amorbubble.h b/amor/amorbubble.h
index f55cbd2..54e8912 100644
--- a/amor/amorbubble.h
+++ b/amor/amorbubble.h
@@ -40,7 +40,7 @@ class TQTimer;
//---------------------------------------------------------------------------
//
-// AmorBubble displays a message in a shaped window
+// AmorBubble displays a message in a tqshaped 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; // shape mask
+ 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 38dd0d3..e5cc7b0 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 );
- repaint(false);
+ tqrepaint(false);
}
update();
diff --git a/amor/amorwidget.h b/amor/amorwidget.h
index 3b46d4b..15f9126 100644
--- a/amor/amorwidget.h
+++ b/amor/amorwidget.h
@@ -36,7 +36,7 @@
//---------------------------------------------------------------------------
//
-// AmorWidget displays a shaped pixmap
+// AmorWidget displays a tqshaped pixmap
//
class AmorWidget : public TQWidget
{
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 11:53:32 +0000