Rename old tq methods that no longer need a unique name

1 files changed, 10 insertions, 10 deletions

diff --git a/src/basket.cpp b/src/basket.cpp
index 6532335..9f3cedd 100644
--- a/src/basket.cpp
+++ b/src/basket.cpp
@@ -1107,7 +1107,7 @@ bool Basket::save()
 		return false;
 	}
 
-	Global::bnpView->setUnsavedtqStatus(false);
+	Global::bnpView->setUnsavedStatus(false);
 	return true;
 }
 
@@ -3085,7 +3085,7 @@ void Basket::drawContents(TQPainter *painter, int clipX, int clipY, int clipWidt
 #else
 			label->setText( text + i18n("Encryption is not supported by<br/>this version of %1.").tqarg(kapp->aboutData()->programName()) );
 #endif
-			label->tqsetAlignment( int( TQLabel::AlignTop ) );
+			label->setAlignment( int( TQLabel::AlignTop ) );
 			tqlayout->addMultiCellWidget( label, 0, 0, 1, 2 );
 			TQLabel* pixmap = new TQLabel( m_decryptBox, "pixmap" );
 			pixmap->setPixmap( KGlobal::iconLoader()->loadIcon("encrypted", KIcon::NoGroup, KIcon::SizeHuge) );
@@ -3098,11 +3098,11 @@ void Basket::drawContents(TQPainter *painter, int clipX, int clipY, int clipWidt
 				i18n("To make baskets stay unlocked, change the automatic<br>"
 				     "locking duration in the application settings.") + "</small>",
 				m_decryptBox);
-			//label->setFixedWidth(label->tqsizeHint().width() / 2);
-			label->tqsetAlignment( int( TQLabel::AlignTop ) );
+			//label->setFixedWidth(label->sizeHint().width() / 2);
+			label->setAlignment( int( TQLabel::AlignTop ) );
 			tqlayout->addMultiCellWidget( label, 2,2,0,2 );
 
-			m_decryptBox->resize(tqlayout->tqsizeHint());
+			m_decryptBox->resize(tqlayout->sizeHint());
 		}
 		if(m_decryptBox->isHidden())
 		{
@@ -3137,7 +3137,7 @@ void Basket::drawContents(TQPainter *painter, int clipX, int clipY, int clipWidt
 		int hrt = rt.height();
 		painter2.fillRect(0, 0, visibleWidth(), visibleHeight(), brush);
 		blendBackground(painter2, TQRect(0, 0, visibleWidth(), visibleHeight()), -1, -1, /*opaque=*/true);
-		TQColorGroup cg = tqcolorGroup();
+		TQColorGroup cg = colorGroup();
 		cg.setColor(TQColorGroup::Text, textColor());
 		rt.draw(&painter2, 0, (visibleHeight() - hrt) / 2, TQRect(), cg);
 		painter2.end();
@@ -3392,7 +3392,7 @@ void Basket::popupEmblemMenu(Note *note, int emblemNumber)
 			TQKeySequence sequence;
 			if (currentState == nextState && !tag->shortcut().isNull())
 				sequence = tag->shortcut().operator TQKeySequence();
-			menu.insertItem(StateMenuItem::radioButtonIconSet(state == currentState, menu.tqcolorGroup()), new StateMenuItem(currentState, sequence, false), i );
+			menu.insertItem(StateMenuItem::radioButtonIconSet(state == currentState, menu.colorGroup()), new StateMenuItem(currentState, sequence, false), i );
 			if (currentState == nextState && !tag->shortcut().isNull())
 				menu.setAccel(sequence, i);
 			++i;
@@ -3494,7 +3494,7 @@ void Basket::popupTagsMenu(Note *note)
 // 		TQKeySequence sequence;
 // 		if (!currentTag->shortcut().isNull())
 // 			sequence = currentTag->shortcut().operator TQKeySequence();
-// 		menu.insertItem(StateMenuItem::checkBoxIconSet(note->hasTag(currentTag), menu.tqcolorGroup()), new StateMenuItem(currentState, sequence, true), i );
+// 		menu.insertItem(StateMenuItem::checkBoxIconSet(note->hasTag(currentTag), menu.colorGroup()), new StateMenuItem(currentState, sequence, true), i );
 // 		if (!currentTag->shortcut().isNull())
 // 			menu.setAccel(sequence, i);
 // 		++i;
@@ -3730,7 +3730,7 @@ void Basket::contentChangedInEditor()
 		if (m_inactivityAutoSaveTimer.isActive())
 			m_inactivityAutoSaveTimer.stop();
 		m_inactivityAutoSaveTimer.start(3 * 1000, /*singleShot=*/true);
-		Global::bnpView->setUnsavedtqStatus(true);
+		Global::bnpView->setUnsavedStatus(true);
 //	}
 }
 
@@ -5443,7 +5443,7 @@ DiskErrorDialog::DiskErrorDialog(const TQString &titleMessage, const TQString &m
 	TQPixmap icon = kapp->iconLoader()->loadIcon("hdd_unmount", KIcon::NoGroup, 64, KIcon::DefaultState, /*path_store=*/0L, /*canReturnNull=*/true);
 	TQLabel *iconLabel  = new TQLabel(plainPage());
 	iconLabel->setPixmap(icon);
-	iconLabel->setFixedSize(iconLabel->tqsizeHint());
+	iconLabel->setFixedSize(iconLabel->sizeHint());
 	TQLabel *label = new TQLabel("<p><nobr><b><font size='+1'>" + titleMessage + "</font></b></nobr></p><p>" + message + "</p>", plainPage());
 	if (!icon.isNull())
 		tqlayout->addWidget(iconLabel);