From ae6cafee5339716bd01aa6c66aa4f366bdc5d43b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:55:33 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 882bcd26b3d60be72ea2b35921969a9850c52db9.
---
 src/basketlistview.cpp | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'src/basketlistview.cpp')

diff --git a/src/basketlistview.cpp b/src/basketlistview.cpp
index a963f8f..434e1a9 100644
--- a/src/basketlistview.cpp
+++ b/src/basketlistview.cpp
@@ -109,8 +109,8 @@ TQString BasketListViewItem::escapedName(const TQString &string)
 	TQString letter; // Find the letter
 	TQString altKey   = /*i18n(*/"Alt"/*)*/;   //i18n("The [Alt] key, as shown in shortcuts like Alt+C...", "Alt");
 	TQString shiftKey = /*i18n(*/"Shift"/*)*/; //i18n("The [Shift] key, as shown in shortcuts like Alt+Shift+1...", "Shift");
-	TQRegExp altLetterExp(      TQString("^%1\\+(.)$").arg(altKey)                );
-	TQRegExp altShiftLetterExp( TQString("^%1\\+%2\\+(.)$").arg(altKey, shiftKey) );
+	TQRegExp altLetterExp(      TQString("^%1\\+(.)$").tqarg(altKey)                );
+	TQRegExp altShiftLetterExp( TQString("^%1\\+%2\\+(.)$").tqarg(altKey, shiftKey) );
 	if (altLetterExp.search(m_basket->shortcut().toStringInternal()) != -1)
 		letter = altLetterExp.cap(1);
 	if (letter.isEmpty() && altShiftLetterExp.search(m_basket->shortcut().toStringInternal()) != -1)
@@ -140,7 +140,7 @@ void BasketListViewItem::setup()
 
 	setPixmap(/*column=*/0, icon);
 
-	repaint();
+	tqrepaint();
 }
 
 BasketListViewItem* BasketListViewItem::lastChild()
@@ -260,7 +260,7 @@ extern void drawGradient( TQPainter *p, const TQColor &colorTop, const TQColor &
 TQPixmap BasketListViewItem::circledTextPixmap(const TQString &text, int height, const TQFont &font, const TQColor &color)
 {
 	TQString key = TQString("BLI-%1.%2.%3.%4")
-		.arg(text).arg(height).arg(font.toString()).arg(color.rgb());
+		.tqarg(text).tqarg(height).tqarg(font.toString()).tqarg(color.rgb());
 	if (TQPixmap* cached=TQPixmapCache::find(key)) {
 		return *cached;
 	}
@@ -335,12 +335,12 @@ TQPixmap BasketListViewItem::foundCountPixmap(bool isLoading, int countFound, bo
 	TQString text;
 	if (childsAreLoading) {
 		if (countChildsFound > 0)
-			text = i18n("%1+%2+").arg(TQString::number(countFound), TQString::number(countChildsFound));
+			text = i18n("%1+%2+").tqarg(TQString::number(countFound), TQString::number(countChildsFound));
 		else
-			text = i18n("%1+").arg(TQString::number(countFound));
+			text = i18n("%1+").tqarg(TQString::number(countFound));
 	} else {
 		if (countChildsFound > 0)
-			text = i18n("%1+%2").arg(TQString::number(countFound), TQString::number(countChildsFound));
+			text = i18n("%1+%2").tqarg(TQString::number(countFound), TQString::number(countChildsFound));
 		else if (countFound > 0)
 			text = TQString::number(countFound);
 		else
@@ -412,7 +412,7 @@ int BasketListViewItem::countHiddenChildsFound()
 	return countChildsFound();
 }
 
-void BasketListViewItem::paintCell(TQPainter *painter, const TQColorGroup &/*colorGroup*/, int /*column*/, int width, int /*align*/)
+void BasketListViewItem::paintCell(TQPainter *painter, const TQColorGroup &/*tqcolorGroup*/, int /*column*/, int width, int /*align*/)
 {
 	// Workaround a TQt bug:
 	// When the splitter is moved to hide the tree view and then the application is restarted,
@@ -452,21 +452,21 @@ void BasketListViewItem::paintCell(TQPainter *painter, const TQColorGroup &/*col
 	// Don't forget to update the key computation if parameters
 	// affecting the rendering logic change
 	TQString key = TQString("BLVI::pC-%1.%2.%3.%4.%5.%6.%7.%8.%9.%10.%11.%12.%13.%14.%15")
-		.arg(effectiveWidth)
-		.arg(drawRoundRect)
-		.arg(textColor.rgb())
-		.arg(m_basket->backgroundColor().rgb())
-		.arg(isCurrentBasket())
-		.arg(shownBelow && shownBelow->isCurrentBasket())
-		.arg(shownAbove && shownAbove->isCurrentBasket())
-		.arg(showLoadingIcon)
-		.arg(showEncryptedIcon)
-		.arg(showCountPixmap)
-		.arg(m_basket->countFounds())
-		.arg(countHiddenChildsFound())
-		.arg(m_isUnderDrag)
-		.arg(m_basket->basketName())
-		.arg(m_basket->icon());
+		.tqarg(effectiveWidth)
+		.tqarg(drawRoundRect)
+		.tqarg(textColor.rgb())
+		.tqarg(m_basket->backgroundColor().rgb())
+		.tqarg(isCurrentBasket())
+		.tqarg(shownBelow && shownBelow->isCurrentBasket())
+		.tqarg(shownAbove && shownAbove->isCurrentBasket())
+		.tqarg(showLoadingIcon)
+		.tqarg(showEncryptedIcon)
+		.tqarg(showCountPixmap)
+		.tqarg(m_basket->countFounds())
+		.tqarg(countHiddenChildsFound())
+		.tqarg(m_isUnderDrag)
+		.tqarg(m_basket->basketName())
+		.tqarg(m_basket->icon());
 	if (TQPixmap* cached = TQPixmapCache::find(key)) {
 		// TQt's documentation recommends copying the pointer
 		// into a TQPixmap immediately
@@ -623,7 +623,7 @@ public:
 		TQListViewItem *item = m_basketView->itemAt(m_basketView->contentsToViewport(pos));
 		BasketListViewItem* bitem = dynamic_cast<BasketListViewItem*>(item);
 		if (bitem && bitem->isAbbreviated()) {
-			tip(m_basketView->itemRect(bitem), bitem->basket()->basketName());
+			tip(m_basketView->tqitemRect(bitem), bitem->basket()->basketName());
 		}
 	}
 private:
-- 
cgit v1.2.1