Rename old tq methods that no longer need a unique name

1 files changed, 39 insertions, 39 deletions

diff --git a/src/basketstatusbar.cpp b/src/basketstatusbar.cpp
index 42127cf..14edc82 100644
--- a/src/basketstatusbar.cpp
+++ b/src/basketstatusbar.cpp
@@ -34,12 +34,12 @@
 #include <tqtooltip.h>
 
 BasketStatusBar::BasketStatusBar(KStatusBar *bar)
-	: m_bar(bar), m_extension(0), m_selectiontqStatus(0), m_locktqStatus(0), m_baskettqStatus(0), m_savedtqStatus(0)
+	: m_bar(bar), m_extension(0), m_selectionStatus(0), m_lockStatus(0), m_basketStatus(0), m_savedStatus(0)
 {
 }
 
 BasketStatusBar::BasketStatusBar(KParts::StatusBarExtension *extension)
-	: m_bar(0), m_extension(extension), m_selectiontqStatus(0), m_locktqStatus(0), m_baskettqStatus(0), m_savedtqStatus(0)
+	: m_bar(0), m_extension(extension), m_selectionStatus(0), m_lockStatus(0), m_basketStatus(0), m_savedStatus(0)
 {
 }
 
@@ -72,32 +72,32 @@ void BasketStatusBar::setupStatusBar()
 	//Tools::printChildren(parent);
 	if(lst->count() == 0)
 	{
-		m_baskettqStatus = new TQLabel(parent);
-		m_baskettqStatus->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored, 0, 0, false) );
-		addWidget( m_baskettqStatus, 1, false ); // Fit all extra space and is hiddable
+		m_basketStatus = new TQLabel(parent);
+		m_basketStatus->setSizePolicy( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored, 0, 0, false) );
+		addWidget( m_basketStatus, 1, false ); // Fit all extra space and is hiddable
 	}
 	else
-		m_baskettqStatus = static_cast<TQLabel*>(TQT_TQWIDGET(lst->at(0)));
+		m_basketStatus = static_cast<TQLabel*>(TQT_TQWIDGET(lst->at(0)));
 	delete lst;
 
-	m_selectiontqStatus = new TQLabel(i18n("Loading..."), parent);
-	addWidget( m_selectiontqStatus, 0, true );
+	m_selectionStatus = new TQLabel(i18n("Loading..."), parent);
+	addWidget( m_selectionStatus, 0, true );
 
-	m_locktqStatus = new ClickableLabel(0/*this*/);
-	m_locktqStatus->setMinimumSize(18, 18);
-	m_locktqStatus->tqsetAlignment(TQt::AlignCenter);
-//	addWidget( m_locktqStatus, 0, true );
-	connect( m_locktqStatus, TQT_SIGNAL(clicked()), Global::bnpView, TQT_SLOT(lockBasket()) );
+	m_lockStatus = new ClickableLabel(0/*this*/);
+	m_lockStatus->setMinimumSize(18, 18);
+	m_lockStatus->setAlignment(TQt::AlignCenter);
+//	addWidget( m_lockStatus, 0, true );
+	connect( m_lockStatus, TQT_SIGNAL(clicked()), Global::bnpView, TQT_SLOT(lockBasket()) );
 
 	m_savedStatusPixmap = SmallIcon("filesave");
-	m_savedtqStatus = new TQLabel(parent);
-	m_savedtqStatus->setPixmap(m_savedStatusPixmap);
-	m_savedtqStatus->setFixedSize(m_savedtqStatus->tqsizeHint());
-	m_savedtqStatus->clear();
-	//m_savedtqStatus->setPixmap(m_savedStatusIconSet.pixmap(TQIconSet::Small, TQIconSet::Disabled));
-	//m_savedtqStatus->setEnabled(false);
-	addWidget( m_savedtqStatus, 0, true );
-	TQToolTip::add(m_savedtqStatus, "<p>" + i18n("Shows if there are changes that have not yet been saved."));
+	m_savedStatus = new TQLabel(parent);
+	m_savedStatus->setPixmap(m_savedStatusPixmap);
+	m_savedStatus->setFixedSize(m_savedStatus->sizeHint());
+	m_savedStatus->clear();
+	//m_savedStatus->setPixmap(m_savedStatusIconSet.pixmap(TQIconSet::Small, TQIconSet::Disabled));
+	//m_savedStatus->setEnabled(false);
+	addWidget( m_savedStatus, 0, true );
+	TQToolTip::add(m_savedStatus, "<p>" + i18n("Shows if there are changes that have not yet been saved."));
 }
 
 void BasketStatusBar::postStatusbarMessage(const TQString& text)
@@ -108,8 +108,8 @@ void BasketStatusBar::postStatusbarMessage(const TQString& text)
 
 void BasketStatusBar::setStatusText(const TQString &txt)
 {
-	if(m_baskettqStatus && m_baskettqStatus->text() != txt)
-		m_baskettqStatus->setText(txt);
+	if(m_basketStatus && m_basketStatus->text() != txt)
+		m_basketStatus->setText(txt);
 }
 
 void BasketStatusBar::setStatusBarHint(const TQString &hint)
@@ -137,40 +137,40 @@ void BasketStatusBar::updateStatusBarHint()
 	setStatusText(message);
 }
 
-void BasketStatusBar::setLocktqStatus(bool isLocked)
+void BasketStatusBar::setLockStatus(bool isLocked)
 {
-	if(!m_locktqStatus)
+	if(!m_lockStatus)
 		return;
 
 	if (isLocked) {
-		m_locktqStatus->setPixmap(SmallIcon("encrypted.png"));
-		TQToolTip::add(m_locktqStatus, i18n(
+		m_lockStatus->setPixmap(SmallIcon("encrypted.png"));
+		TQToolTip::add(m_lockStatus, i18n(
 				"<p>This basket is <b>locked</b>.<br>Click to unlock it.</p>").replace(" ", "&nbsp;") );
-//		TQToolTip::add(m_locktqStatus, i18n("This basket is locked.\nClick to unlock it."));
+//		TQToolTip::add(m_lockStatus, i18n("This basket is locked.\nClick to unlock it."));
 	} else {
-		m_locktqStatus->clear();
-		TQToolTip::add(m_locktqStatus, i18n(
+		m_lockStatus->clear();
+		TQToolTip::add(m_lockStatus, i18n(
 				"<p>This basket is <b>unlocked</b>.<br>Click to lock it.</p>").replace(" ", "&nbsp;") );
-//		TQToolTip::add(m_locktqStatus, i18n("This basket is unlocked.\nClick to lock it."));
+//		TQToolTip::add(m_lockStatus, i18n("This basket is unlocked.\nClick to lock it."));
 	}
 }
 
-void BasketStatusBar::setSelectiontqStatus(const TQString &s)
+void BasketStatusBar::setSelectionStatus(const TQString &s)
 {
-	if (m_selectiontqStatus)
-		m_selectiontqStatus->setText(s);
+	if (m_selectionStatus)
+		m_selectionStatus->setText(s);
 }
 
-void BasketStatusBar::setUnsavedtqStatus(bool isUnsaved)
+void BasketStatusBar::setUnsavedStatus(bool isUnsaved)
 {
-	if (!m_savedtqStatus)
+	if (!m_savedStatus)
 		return;
 
 	if (isUnsaved) {
-		if (m_savedtqStatus->pixmap() == 0)
-			m_savedtqStatus->setPixmap(m_savedStatusPixmap);
+		if (m_savedStatus->pixmap() == 0)
+			m_savedStatus->setPixmap(m_savedStatusPixmap);
 	} else
-		m_savedtqStatus->clear();
+		m_savedStatus->clear();
 }
 
 #include "basketstatusbar.moc"