From 3ee504ecba6caf3c2609a8648fe3659f2b541544 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 18 Dec 2011 18:35:14 -0600
Subject: Rename old tq methods that no longer need a unique name

---
 amor/amor.cpp       | 4 ++--
 amor/amoranim.cpp   | 4 ++--
 amor/amoranim.h     | 4 ++--
 amor/amorbubble.cpp | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'amor')

diff --git a/amor/amor.cpp b/amor/amor.cpp
index 0a9b436..a9a73e3 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);
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..5060f97 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 );
@@ -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);
 }
 
 //---------------------------------------------------------------------------
-- 
cgit v1.2.1