Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 882bcd26b3d60be72ea2b35921969a9850c52db9.

1 files changed, 24 insertions, 24 deletions

diff --git a/src/bnpview.cpp b/src/bnpview.cpp
index c20369d..1d7488c 100644
--- a/src/bnpview.cpp
+++ b/src/bnpview.cpp
@@ -1342,19 +1342,19 @@ void BNPView::notesStateChanged()
 
 	// Update statusbar message :
 	if (currentBasket()->isLocked())
-		setSelectionStatus(i18n("Locked"));
+		setSelectiontqStatus(i18n("Locked"));
 	else if (!basket->isLoaded())
-		setSelectionStatus(i18n("Loading..."));
+		setSelectiontqStatus(i18n("Loading..."));
 	else if (basket->count() == 0)
-		setSelectionStatus(i18n("No notes"));
+		setSelectiontqStatus(i18n("No notes"));
 	else {
 		TQString count     = i18n("%n note",     "%n notes",    basket->count()         );
 		TQString selecteds = i18n("%n selected", "%n selected", basket->countSelecteds());
 		TQString showns    = (currentDecoratedBasket()->filterData().isFiltering ? i18n("all matches") : i18n("no filter"));
 		if (basket->countFounds() != basket->count())
 			showns = i18n("%n match", "%n matches", basket->countFounds());
-		setSelectionStatus(
-				i18n("e.g. '18 notes, 10 matches, 5 selected'", "%1, %2, %3").arg(count, showns, selecteds) );
+		setSelectiontqStatus(
+				i18n("e.g. '18 notes, 10 matches, 5 selected'", "%1, %2, %3").tqarg(count, showns, selecteds) );
 	}
 
 	// If we added a note that match the global filter, update the count number in the tree:
@@ -1544,8 +1544,8 @@ TQPopupMenu* BNPView::popupMenu(const TQString &menuName)
 							"<p>As last ressort, if you are sure the application is correctly installed "
 							"but you had a preview version of it, try to remove the "
 							"file %5basketui.rc</p>")
-							.arg(kapp->aboutData()->programName(), kapp->aboutData()->programName(),
-								stdDirs.saveLocation("data", "basket/")).arg(stdDirs.saveLocation("data", "basket/"), stdDirs.saveLocation("data", "basket/")),
+							.tqarg(kapp->aboutData()->programName(), kapp->aboutData()->programName(),
+								stdDirs.saveLocation("data", "basket/")).tqarg(stdDirs.saveLocation("data", "basket/"), stdDirs.saveLocation("data", "basket/")),
 					i18n("Ressource not Found"), KMessageBox::AllowLink );
 		}
 		if(!isPart())
@@ -1701,13 +1701,13 @@ void BNPView::delBasket()
 	KMessageBox::createKMessageBox(
 			dialog, TQMessageBox::Information,
 			i18n("<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>")
-				.arg(Tools::textToHTMLWithoutP(basket->basketName())),
+				.tqarg(Tools::textToHTMLWithoutP(basket->basketName())),
 			basketsList, /*ask=*/"", /*checkboxReturn=*/0, /*options=*/KMessageBox::Notify/*, const TQString &details=TQString()*/);
 #endif
 
 	int really = KMessageBox::questionYesNo( this,
 											 i18n("<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>")
-													 .arg(Tools::textToHTMLWithoutP(basket->basketName())),
+													 .tqarg(Tools::textToHTMLWithoutP(basket->basketName())),
 											 i18n("Remove Basket")
 #if KDE_IS_VERSION( 3, 2, 90 ) // KDE 3.3.x
 													 , KGuiItem(i18n("&Remove Basket"), "editdelete"), KStdGuiItem::cancel());
@@ -1721,8 +1721,8 @@ void BNPView::delBasket()
 	TQStringList basketsList = listViewItemForBasket(basket)->childNamesTree();
 	if (basketsList.count() > 0) {
 		int deleteChilds = KMessageBox::questionYesNoList( this,
-				i18n("<qt><b>%1</b> have the following children baskets.<br>Do you want to remove them too?</qt>")
-						.arg(Tools::textToHTMLWithoutP(basket->basketName())),
+				i18n("<qt><b>%1</b> have the following tqchildren baskets.<br>Do you want to remove them too?</qt>")
+						.tqarg(Tools::textToHTMLWithoutP(basket->basketName())),
 				basketsList,
 				i18n("Remove Children Baskets")
 #if KDE_IS_VERSION( 3, 2, 90 ) // KDE 3.3.x
@@ -1808,7 +1808,7 @@ void BNPView::saveAsArchive()
 			int result = KMessageBox::questionYesNoCancel(
 				this,
 				"<qt>" + i18n("The file <b>%1</b> already exists. Do you really want to override it?")
-					.arg(KURL(destination).fileName()),
+					.tqarg(KURL(destination).fileName()),
 				i18n("Override File?"),
 				KGuiItem(i18n("&Override"), "filesave")
 			);
@@ -1870,7 +1870,7 @@ void BNPView::isLockedChanged()
 {
 	bool isLocked = currentBasket()->isLocked();
 
-	setLockStatus(isLocked);
+	setLocktqStatus(isLocked);
 
 //	m_actLockBasket->setChecked(isLocked);
 	m_actPropBasket->setEnabled(!isLocked);
@@ -1955,7 +1955,7 @@ void BNPView::showPassiveDroppedDelayed()
 	TQPixmap contentsPixmap = NoteDrag::feedbackPixmap(m_passiveDroppedSelection);
 	TQMimeSourceFactory::defaultFactory()->setPixmap("_passivepopup_image_", contentsPixmap);
 	m_passivePopup->setView(
-			title.arg(Tools::textToHTMLWithoutP(currentBasket()->basketName())),
+			title.tqarg(Tools::textToHTMLWithoutP(currentBasket()->basketName())),
 	(contentsPixmap.isNull() ? "" : "<img src=\"_passivepopup_image_\">"),
 	kapp->iconLoader()->loadIcon(currentBasket()->icon(), KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true));
 	m_passivePopup->show();
@@ -1967,8 +1967,8 @@ void BNPView::showPassiveImpossible(const TQString &message)
 	m_passivePopup = new KPassivePopup(Settings::useSystray() ? (TQWidget*)Global::systemTray : (TQWidget*)this);
 	m_passivePopup->setView(
 			TQString("<font color=red>%1</font>")
-			.arg(i18n("Basket <i>%1</i> is locked"))
-			.arg(Tools::textToHTMLWithoutP(currentBasket()->basketName())),
+			.tqarg(i18n("Basket <i>%1</i> is locked"))
+			.tqarg(Tools::textToHTMLWithoutP(currentBasket()->basketName())),
 	message,
 	kapp->iconLoader()->loadIcon(currentBasket()->icon(), KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true));
 	m_passivePopup->show();
@@ -1992,7 +1992,7 @@ void BNPView::showPassiveContent(bool forceShow/* = false*/)
 	m_passivePopup->setView(
 			"<qt>" + kapp->makeStdCaption( currentBasket()->isLocked()
 			? TQString("%1 <font color=gray30>%2</font>")
-			.arg(Tools::textToHTMLWithoutP(currentBasket()->basketName()), i18n("(Locked)"))
+			.tqarg(Tools::textToHTMLWithoutP(currentBasket()->basketName()), i18n("(Locked)"))
 	: Tools::textToHTMLWithoutP(currentBasket()->basketName()) ),
 	message,
 	kapp->iconLoader()->loadIcon(currentBasket()->icon(), KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true));
@@ -2044,14 +2044,14 @@ void BNPView::updateStatusBarHint()
 	m_statusbar->updateStatusBarHint();
 }
 
-void BNPView::setSelectionStatus(TQString s)
+void BNPView::setSelectiontqStatus(TQString s)
 {
-	m_statusbar->setSelectionStatus(s);
+	m_statusbar->setSelectiontqStatus(s);
 }
 
-void BNPView::setLockStatus(bool isLocked)
+void BNPView::setLocktqStatus(bool isLocked)
 {
-	m_statusbar->setLockStatus(isLocked);
+	m_statusbar->setLocktqStatus(isLocked);
 }
 
 void BNPView::postStatusbarMessage(const TQString& msg)
@@ -2064,9 +2064,9 @@ void BNPView::setStatusBarHint(const TQString &hint)
 	m_statusbar->setStatusBarHint(hint);
 }
 
-void BNPView::setUnsavedStatus(bool isUnsaved)
+void BNPView::setUnsavedtqStatus(bool isUnsaved)
 {
-	m_statusbar->setUnsavedStatus(isUnsaved);
+	m_statusbar->setUnsavedtqStatus(isUnsaved);
 }
 
 void BNPView::setActive(bool active)
@@ -2299,7 +2299,7 @@ void BNPView::populateTagsMenu(KPopupMenu &menu, Note *referenceNote)
 			sequence = currentTag->shortcut().operator TQKeySequence();
 		menu.insertItem(StateMenuItem::checkBoxIconSet(
 			(referenceNote ? referenceNote->hasTag(currentTag) : false),
-			menu.colorGroup()),
+			menu.tqcolorGroup()),
 			new StateMenuItem(currentState, sequence, true),
 			i
 		);