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

1 files changed, 26 insertions, 26 deletions

diff --git a/src/likeback.cpp b/src/likeback.cpp
index aafcab9..d55f3bc 100644
--- a/src/likeback.cpp
+++ b/src/likeback.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtoolbutton.h>
 #include <kpushbutton.h>
 #include <tqcheckbox.h>
@@ -36,8 +36,8 @@
 #include <tqvgroupbox.h>
 #include <kguiitem.h>
 #include <tqpopupmenu.h>
-#include <tqtextedit.h>
-#include <tqlayout.h>
+#include <textedit.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <kdialogbase.h>
 #include <tqhttp.h>
@@ -62,7 +62,7 @@ LikeBackBar::LikeBackBar(LikeBack *likeBack)
  : TQWidget(0, "LikeBackBar", TQt::WX11BypassWM | TQt::WStyle_NoBorder | TQt::WNoAutoErase | TQt::WStyle_StaysOnTop | TQt::WStyle_NoBorder | TQt::TQt::WGroupLeader)
  , m_likeBack(likeBack)
 {
-	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+	TQHBoxLayout *layout = new TQHBoxLayout(this);
 
 	TQIconSet likeIconSet    = kapp->iconLoader()->loadIconSet("likeback_like",    KIcon::Small);
 	TQIconSet dislikeIconSet = kapp->iconLoader()->loadIconSet("likeback_dislike", KIcon::Small);
@@ -74,28 +74,28 @@ LikeBackBar::LikeBackBar(LikeBack *likeBack)
 	m_likeButton->setTextLabel("<p>" + i18n("Send application developers a comment about something you like"));
 	m_likeButton->setAutoRaise(true);
 	connect( m_likeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickedLike()) );
-	tqlayout->add(m_likeButton);
+	layout->add(m_likeButton);
 
 	m_dislikeButton = new TQToolButton(this, "likeback_dislike");
 	m_dislikeButton->setIconSet(dislikeIconSet);
 	m_dislikeButton->setTextLabel("<p>" + i18n("Send application developers a comment about something you dislike"));
 	m_dislikeButton->setAutoRaise(true);
 	connect( m_dislikeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickedDislike()) );
-	tqlayout->add(m_dislikeButton);
+	layout->add(m_dislikeButton);
 
 	m_bugButton = new TQToolButton(this, "likeback_bug");
 	m_bugButton->setIconSet(bugIconSet);
 	m_bugButton->setTextLabel("<p>" + i18n("Send application developers a comment about an improper behavior of the application"));
 	m_bugButton->setAutoRaise(true);
 	connect( m_bugButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickedBug()) );
-	tqlayout->add(m_bugButton);
+	layout->add(m_bugButton);
 
 	m_featureButton = new TQToolButton(this, "likeback_feature");
 	m_featureButton->setIconSet(featureIconSet);
 	m_featureButton->setTextLabel("<p>" + i18n("Send application developers a comment about a new feature you desire"));
 	m_featureButton->setAutoRaise(true);
 	connect( m_featureButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickedFeature()) );
-	tqlayout->add(m_featureButton);
+	layout->add(m_featureButton);
 
 	connect( &m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(autoMove()) );
 
@@ -232,7 +232,7 @@ LikeBack::LikeBack(Button buttons, bool showBarByDefault, KConfig *config, const
 
 	// Initialize the button-bar:
 	d->bar = new LikeBackBar(this);
-	d->bar->resize(d->bar->tqsizeHint());
+	d->bar->resize(d->bar->sizeHint());
 
 	// Show the information message if it is the first time, and if the button-bar is shown:
 	static const char *messageShown = "LikeBack_starting_information";
@@ -430,7 +430,7 @@ void LikeBack::showInformationMessage()
 		"<p><b>" + (isDevelopmentVersion(d->aboutData->version()) ?
 			i18n("Welcome to this testing version of %1.") :
 			i18n("Welcome to %1.")
-		).tqarg(d->aboutData->programName()) + "</b></p>"
+		).arg(d->aboutData->programName()) + "</b></p>"
 		"<p>" + i18n("To help us improve it, your comments are important.") + "</p>"
 		"<p>" +
 			((buttons & LikeBack::Like) && (buttons & LikeBack::Dislike) ?
@@ -583,7 +583,7 @@ bool LikeBack::isDevelopmentVersion(const TQString &version)
 	if (m_process)
 		return;
 	m_process = new KProcess();
-	*m_process << TQString::tqfromLatin1("kcmshell") << TQString::tqfromLatin1("kcm_useraccount");
+	*m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount");
 	connect( m_process, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(fetchUserEmail()) );
 	if (!m_process->start()) {
 		kdDebug() << "Couldn't start kcmshell.." << endl;
@@ -604,23 +604,23 @@ void LikeBack::fetchUserEmail()
 //	m_configureEmail->setEnabled(true);
 
 	// ### KDE4: why oh why is KEmailSettings in kio?
-	KConfig emailConf( TQString::tqfromLatin1("emaildefaults") );
+	KConfig emailConf( TQString::fromLatin1("emaildefaults") );
 
 	// find out the default profile
-	emailConf.setGroup(TQString::tqfromLatin1("Defaults"));
-	TQString profile = TQString::tqfromLatin1("PROFILE_");
-	profile += emailConf.readEntry(TQString::tqfromLatin1("Profile"), TQString::tqfromLatin1("Default"));
+	emailConf.setGroup(TQString::fromLatin1("Defaults"));
+	TQString profile = TQString::fromLatin1("PROFILE_");
+	profile += emailConf.readEntry(TQString::fromLatin1("Profile"), TQString::fromLatin1("Default"));
 
 	emailConf.setGroup(profile);
-	TQString fromaddr = emailConf.readEntry(TQString::tqfromLatin1("EmailAddress"));
+	TQString fromaddr = emailConf.readEntry(TQString::fromLatin1("EmailAddress"));
 	if (fromaddr.isEmpty()) {
 		struct passwd *p;
 		p = getpwuid(getuid());
-		d->fetchedEmail = TQString::tqfromLatin1(p->pw_name);
+		d->fetchedEmail = TQString::fromLatin1(p->pw_name);
 	} else {
-		TQString name = emailConf.readEntry(TQString::tqfromLatin1("FullName"));
+		TQString name = emailConf.readEntry(TQString::fromLatin1("FullName"));
 		if (!name.isEmpty())
-			d->fetchedEmail = /*name + TQString::tqfromLatin1(" <") +*/ fromaddr /*+ TQString::tqfromLatin1(">")*/;
+			d->fetchedEmail = /*name + TQString::fromLatin1(" <") +*/ fromaddr /*+ TQString::fromLatin1(">")*/;
 	}
 //	m_from->setText( fromaddr );
 }
@@ -670,7 +670,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
 		TQPixmap likePixmap = kapp->iconLoader()->loadIcon("likeback_like", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true);
 		TQLabel *likeIcon = new TQLabel(buttons);
 		likeIcon->setPixmap(likePixmap);
-		likeIcon->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+		likeIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 		TQRadioButton *likeButton = new TQRadioButton(i18n("Something you &like"), buttons);
 		buttonsGrid->addWidget(likeIcon,   /*row=*/0, /*column=*/0);
 		buttonsGrid->addWidget(likeButton, /*row=*/0, /*column=*/1);
@@ -680,7 +680,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
 		TQPixmap dislikePixmap = kapp->iconLoader()->loadIcon("likeback_dislike", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true);
 		TQLabel *dislikeIcon = new TQLabel(buttons);
 		dislikeIcon->setPixmap(dislikePixmap);
-		dislikeIcon->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+		dislikeIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 		TQRadioButton *dislikeButton = new TQRadioButton(i18n("Something you &dislike"), buttons);
 		buttonsGrid->addWidget(dislikeIcon,   /*row=*/1, /*column=*/0);
 		buttonsGrid->addWidget(dislikeButton, /*row=*/1, /*column=*/1);
@@ -690,7 +690,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
 		TQPixmap bugPixmap = kapp->iconLoader()->loadIcon("likeback_bug", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true);
 		TQLabel *bugIcon = new TQLabel(buttons);
 		bugIcon->setPixmap(bugPixmap);
-		bugIcon->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+		bugIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 		TQRadioButton *bugButton = new TQRadioButton(i18n("An improper &behavior of this application"), buttons);
 		buttonsGrid->addWidget(bugIcon,   /*row=*/2, /*column=*/0);
 		buttonsGrid->addWidget(bugButton, /*row=*/2, /*column=*/1);
@@ -700,7 +700,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
 		TQPixmap featurePixmap = kapp->iconLoader()->loadIcon("likeback_feature", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true);
 		TQLabel *featureIcon = new TQLabel(buttons);
 		featureIcon->setPixmap(featurePixmap);
-		featureIcon->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+		featureIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 		TQRadioButton *featureButton = new TQRadioButton(i18n("A new &feature you desire"), buttons);
 		buttonsGrid->addWidget(featureIcon,   /*row=*/3, /*column=*/0);
 		buttonsGrid->addWidget(featureButton, /*row=*/3, /*column=*/1);
@@ -725,7 +725,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
 
 	setButtonGuiItem(Default, KGuiItem(i18n("&Email Address..."), "mail_generic"));
 
-	resize(TQSize(kapp->desktop()->width() * 1 / 2, kapp->desktop()->height() * 3 / 5).expandedTo(tqsizeHint()));
+	resize(TQSize(kapp->desktop()->width() * 1 / 2, kapp->desktop()->height() * 3 / 5).expandedTo(sizeHint()));
 
 	TQAction *sendShortcut = new TQAction(this);
 	sendShortcut->setAccel(TQString("Ctrl+Return"));
@@ -740,7 +740,7 @@ LikeBackDialog::~LikeBackDialog()
 
 TQString LikeBackDialog::introductionText()
 {
-	TQString text = "<p>" + i18n("Please provide a brief description of your opinion of %1.").tqarg(m_likeBack->aboutData()->programName()) + " ";
+	TQString text = "<p>" + i18n("Please provide a brief description of your opinion of %1.").arg(m_likeBack->aboutData()->programName()) + " ";
 
 	TQString languagesMessage = "";
 	if (!m_likeBack->acceptedLocales().isEmpty() && !m_likeBack->acceptedLanguagesMessage().isEmpty()) {
@@ -760,7 +760,7 @@ TQString LikeBackDialog::introductionText()
 		// TODO: Replace the URL with a localized one:
 		text += languagesMessage + " " +
 			i18n("You may be able to use an <a href=\"%1\">online translation tool</a>.")
-			.tqarg("http://www.google.com/language_tools?hl=" + KGlobal::locale()->language())
+			.arg("http://www.google.com/language_tools?hl=" + KGlobal::locale()->language())
 			+ " ";
 
 	// If both "I Like" and "I Dislike" buttons are shown and one is clicked: