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

This reverts commit 9d6927a7d6a543332f828bffedf65eecf6774c6d.

1 files changed, 21 insertions, 21 deletions

diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp
index b376c8e..21ee759 100644
--- a/src/libgui/likeback.cpp
+++ b/src/libgui/likeback.cpp
@@ -26,12 +26,12 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtoolbutton.h>
 #include <tqpushbutton.h>
 #include <tqpopupmenu.h>
-#include <textedit.h>
-#include <layout.h>
+#include <tqtextedit.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <kdialogbase.h>
 #include <tqhttp.h>
@@ -55,7 +55,7 @@ LikeBack::LikeBack(Button buttons)
  : TQWidget( 0, "LikeBack", TQt::WX11BypassWM | TQt::WStyle_NoBorder | TQt::WNoAutoErase | TQt::WStyle_StaysOnTop | TQt::WStyle_NoBorder | TQt::TQt::WGroupLeader)
  , m_buttons(buttons)
 {
-        TQHBoxLayout *layout = new TQHBoxLayout(this);
+        TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
 
         TQIconSet likeIconSet      = kapp->iconLoader()->loadIconSet("likeback_like",      KIcon::Small);
         TQIconSet dislikeIconSet   = kapp->iconLoader()->loadIconSet("likeback_dislike",   KIcon::Small);
@@ -67,21 +67,21 @@ LikeBack::LikeBack(Button buttons)
         m_likeButton->setTextLabel(i18n("I Like..."));
         m_likeButton->setAutoRaise(true);
         connect( m_likeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(iLike()) );
-        layout->add(m_likeButton);
+        tqlayout->add(m_likeButton);
 
         TQToolButton *m_dislikeButton = new TQToolButton(this, "idonotlike");
         m_dislikeButton->setIconSet(dislikeIconSet);
         m_dislikeButton->setTextLabel(i18n("I Do not Like..."));
         m_dislikeButton->setAutoRaise(true);
         connect( m_dislikeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(iDoNotLike()) );
-        layout->add(m_dislikeButton);
+        tqlayout->add(m_dislikeButton);
 
         TQToolButton *m_bugButton = new TQToolButton(this, "ifoundabug");
         m_bugButton->setIconSet(bugIconSet);
         m_bugButton->setTextLabel(i18n("I Found a Bug..."));
         m_bugButton->setAutoRaise(true);
         connect( m_bugButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(iFoundABug()) );
-        layout->add(m_bugButton);
+        tqlayout->add(m_bugButton);
 
         m_configureButton = new TQToolButton(this, "configure");
         TQIconSet helpIconSet = kapp->iconLoader()->loadIconSet("help", KIcon::Small);
@@ -89,7 +89,7 @@ LikeBack::LikeBack(Button buttons)
         m_configureButton->setTextLabel(i18n("Configure..."));
         m_configureButton->setAutoRaise(true);
         connect( m_likeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(configure()) );
-        layout->add(m_configureButton);
+        tqlayout->add(m_configureButton);
 
         TQPopupMenu *configureMenu = new TQPopupMenu(this);
         configureMenu->insertItem(helpIconSet, i18n("What's &This?"), this , TQT_SLOT(showWhatsThisMessage()) );
@@ -110,7 +110,7 @@ LikeBack::LikeBack(Button buttons)
 //                KMessageBox::saveDontShowAgainContinue(messageShown);
 //        }
 
-        resize(sizeHint());
+        resize(tqsizeHint());
 
         connect( &m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(autoMove()) );
         m_timer.start(10);
@@ -171,7 +171,7 @@ void LikeBack::showInformationMessage()
         TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_dislike", dislikeIcon);
         TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_bug",     bugIcon);
         KMessageBox::information(0,
-                "<p><b>" + i18n("This is a quick feedback system for %1.").arg(s_about->programName()) + "</b></p>"
+                "<p><b>" + i18n("This is a quick feedback system for %1.").tqarg(s_about->programName()) + "</b></p>"
                 "<p>" + i18n("To help us improve it, your comments are important.") + "</p>"
                 "<p>" + i18n("Each time you have a great or frustrating experience, "
                              "please click the appropriate hand below the window title-bar, "
@@ -452,7 +452,7 @@ void LikeBack::init(bool isDevelopmentVersion, Button buttons)
         if (m_process)
                 return;
         m_process = new KProcess();
-        *m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount");
+        *m_process << TQString::tqfromLatin1("kcmshell") << TQString::tqfromLatin1("kcm_useraccount");
         connect( m_process, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(endFetchingEmailFrom()) );
         if (!m_process->start()) {
                 kdDebug() << "Couldn't start kcmshell.." << endl;
@@ -473,23 +473,23 @@ void LikeBack::endFetchingEmailFrom()
 //      m_configureEmail->setEnabled(true);
 
         // ### KDE4: why oh why is KEmailSettings in kio?
-        KConfig emailConf( TQString::fromLatin1("emaildefaults") );
+        KConfig emailConf( TQString::tqfromLatin1("emaildefaults") );
 
         // find out the default profile
-        emailConf.setGroup(TQString::fromLatin1("Defaults"));
-        TQString profile = TQString::fromLatin1("PROFILE_");
-        profile += emailConf.readEntry(TQString::fromLatin1("Profile"), TQString::fromLatin1("Default"));
+        emailConf.setGroup(TQString::tqfromLatin1("Defaults"));
+        TQString profile = TQString::tqfromLatin1("PROFILE_");
+        profile += emailConf.readEntry(TQString::tqfromLatin1("Profile"), TQString::tqfromLatin1("Default"));
 
         emailConf.setGroup(profile);
-        TQString fromaddr = emailConf.readEntry(TQString::fromLatin1("EmailAddress"));
+        TQString fromaddr = emailConf.readEntry(TQString::tqfromLatin1("EmailAddress"));
         if (fromaddr.isEmpty()) {
                 struct passwd *p;
                 p = getpwuid(getuid());
-                m_fetchedEmail = TQString::fromLatin1(p->pw_name);
+                m_fetchedEmail = TQString::tqfromLatin1(p->pw_name);
         } else {
-                TQString name = emailConf.readEntry(TQString::fromLatin1("FullName"));
+                TQString name = emailConf.readEntry(TQString::tqfromLatin1("FullName"));
                 if (!name.isEmpty())
-                        m_fetchedEmail = /*name + TQString::fromLatin1(" <") +*/ fromaddr /*+ TQString::fromLatin1(">")*/;
+                        m_fetchedEmail = /*name + TQString::tqfromLatin1(" <") +*/ fromaddr /*+ TQString::tqfromLatin1(">")*/;
         }
 //      m_from->setText( fromaddr );
 }
@@ -580,7 +580,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, TQString windowName, TQS
         m_comment = new TQTextEdit(coloredWidget);
         TQIconSet sendIconSet = kapp->iconLoader()->loadIconSet("mail_send", KIcon::Toolbar);
         m_sendButton = new TQPushButton(sendIconSet, i18n("Send"), coloredWidget);
-        m_sendButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding);
+        m_sendButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding);
         m_sendButton->setEnabled(false);
         connect( m_sendButton, TQT_SIGNAL(clicked()),     this, TQT_SLOT(send())           );
         connect( m_comment,    TQT_SIGNAL(textChanged()), this, TQT_SLOT(commentChanged()) );
@@ -607,7 +607,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, TQString windowName, TQS
         resize(kapp->desktop()->width() / 2, kapp->desktop()->height() / 3);
 
         setCaption(kapp->makeStdCaption(i18n("Send a Comment")));
-        //      setMinimumSize(mainLayout->sizeHint()); // FIXME: Doesn't work!
+        //      setMinimumSize(mainLayout->tqsizeHint()); // FIXME: Doesn't work!
 }
 
 LikeBackDialog::~LikeBackDialog()