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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 33 insertions, 33 deletions

diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp
index acca9922..e477f502 100644
--- a/kword/KWMailMergeDataBase.cpp
+++ b/kword/KWMailMergeDataBase.cpp
@@ -37,7 +37,7 @@
 #include <tqfile.h>
 #include <tqvbox.h>
 #include <tqspinbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 
@@ -60,7 +60,7 @@ KWMailMergeDataBase::KWMailMergeDataBase( KWDocument *doc_ )
 TQStringList KWMailMergeDataBase::availablePlugins()
 {
     TQStringList tmp;
-    KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),TQString());
+    KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::tqfromLatin1("KWord/MailMergePlugin"),TQString());
     for (KTrader::OfferList::Iterator it=pluginOffers.begin();*it;++it)
     {
         tmp.append((*it)->property("X-KDE-InternalName").toString());
@@ -79,7 +79,7 @@ bool KWMailMergeDataBase::loadPlugin(const TQString &name,const TQString &comman
     if (rejectdcopcall)return false;
     TQString constrain=TQString("[X-KDE-InternalName] =='"+name+"'");
     kdDebug()<<constrain<<endl;
-    KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain);
+    KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::tqfromLatin1("KWord/MailMergePlugin"),constrain);
     KService::Ptr it=pluginOffers.first();
 
     TQVariant verProp=it->property("X-KDE-PluginVersion");
@@ -116,9 +116,9 @@ KWMailMergeDataSource *KWMailMergeDataBase::openPluginFor(int type,int &version)
 {
     version=0;
     KWMailMergeDataSource *ret=0;
-    TQString constrain=TQString("'%1' in [X-KDE-Capabilities]").arg(((type==KWSLCreate)?KWSLCreate_text:KWSLOpen_text));
+    TQString constrain=TQString("'%1' in [X-KDE-Capabilities]").tqarg(((type==KWSLCreate)?KWSLCreate_text:KWSLOpen_text));
     kdDebug()<<constrain<<endl;
-    KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain);
+    KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::tqfromLatin1("KWord/MailMergePlugin"),constrain);
 
     //Only for debugging
     for (KTrader::OfferList::Iterator it=pluginOffers.begin();*it;++it)
@@ -162,7 +162,7 @@ KWMailMergeDataSource *KWMailMergeDataBase::loadPlugin(const TQString& name)
       KLibrary *lib = loader->library(TQFile::encodeName(libname));
       if (lib) {
           // get the create_ function
-          TQString factory=TQString("create_%1").arg(name);
+          TQString factory=TQString("create_%1").tqarg(name);
           void *create = lib->symbol(TQFile::encodeName(factory));
 
           if (create)
@@ -280,7 +280,7 @@ TQDomElement KWMailMergeDataBase::save(TQDomDocument &doc) const
     if (plugin)
     {
         kdDebug()<<"KWMailMergeDataBase::save() There is really something to save"<<endl;
-        TQDomElement el=doc.createElement(TQString::fromLatin1("PLUGIN"));
+        TQDomElement el=doc.createElement(TQString::tqfromLatin1("PLUGIN"));
 
         TQDataStream ds(plugin->info,IO_ReadOnly);
         TQString libname;
@@ -288,7 +288,7 @@ TQDomElement KWMailMergeDataBase::save(TQDomDocument &doc) const
         el.setAttribute("library",libname);
         parentElem.appendChild(el);
         kdDebug()<<"KWMailMergeDataBase::save() Calling datasource save()"<<endl;
-        TQDomElement el2=doc.createElement(TQString::fromLatin1("DATASOURCE"));
+        TQDomElement el2=doc.createElement(TQString::tqfromLatin1("DATASOURCE"));
         plugin->save(doc,el2);
         parentElem.appendChild(el2);
 
@@ -329,35 +329,35 @@ KWMailMergeChoosePluginDialog::KWMailMergeChoosePluginDialog( KTrader::OfferList
       /*parent*/ 0, "", true ), pluginOffers( offers )
 {
   TQWidget *back = plainPage();
-  TQVBoxLayout *layout = new TQVBoxLayout( back, 0, spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( back, 0, spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "&Available sources:" ), back );
   chooser = new TQComboBox( false, back );
   label->setBuddy( chooser );
   descriptionLabel = new TQLabel( back );
   descriptionLabel->hide();
-  descriptionLabel->setAlignment( WordBreak );
+  descriptionLabel->tqsetAlignment( WordBreak );
   descriptionLabel->setFrameShape( TQFrame::Box );
   descriptionLabel->setFrameShadow( TQFrame::Sunken );
 
-  TQSize old_sizeHint;
+  TQSize old_tqsizeHint;
   for ( KTrader::OfferList::Iterator it = pluginOffers.begin(); *it; ++it )
   {
     chooser->insertItem( (*it)->name() );
-    old_sizeHint = descriptionLabel->sizeHint();
+    old_tqsizeHint = descriptionLabel->tqsizeHint();
     descriptionLabel->setText( (*it)->comment() );
-    if (descriptionLabel->sizeHint().width()*descriptionLabel->sizeHint().height() > old_sizeHint.width()*old_sizeHint.height())
-        descriptionLabel->setMinimumSize(descriptionLabel->sizeHint() );
+    if (descriptionLabel->tqsizeHint().width()*descriptionLabel->tqsizeHint().height() > old_tqsizeHint.width()*old_tqsizeHint.height())
+        descriptionLabel->setMinimumSize(descriptionLabel->tqsizeHint() );
   }
   descriptionLabel->show();
 
   connect( chooser, TQT_SIGNAL( activated( int ) ),
            this, TQT_SLOT( pluginChanged( int ) ) );
 
-  layout->addWidget( label );
-  layout->addWidget( chooser );
-  layout->addWidget( descriptionLabel );
-  layout->addStretch( 1 );
+  tqlayout->addWidget( label );
+  tqlayout->addWidget( chooser );
+  tqlayout->addWidget( descriptionLabel );
+  tqlayout->addStretch( 1 );
 
   pluginChanged( 0 );
 }
@@ -387,41 +387,41 @@ KWMailMergeConfigDialog::KWMailMergeConfigDialog(TQWidget *parent,KWMailMergeDat
 {
     db_=db;
     TQWidget *back = plainPage();
-    TQVBoxLayout *layout=new TQVBoxLayout(back);
+    TQVBoxLayout *tqlayout=new TQVBoxLayout(back);
 //    TQVBox *back = new TQVBox( page );
-    layout->setSpacing( KDialog::spacingHint() );
+    tqlayout->setSpacing( KDialog::spacingHint() );
 
 //    TQVBox *row1 = new TQVBox( back );
 //    row1->setSpacing( KDialog::spacingHint() );
 
     TQLabel *l = new TQLabel( i18n( "Datasource:" ),back );
-//    l->setMaximumHeight( l->sizeHint().height() );
-    layout->addWidget(l);
+//    l->setMaximumHeight( l->tqsizeHint().height() );
+    tqlayout->addWidget(l);
 
     TQHBox *row1=new TQHBox(back);
-    layout->addWidget(row1);
+    tqlayout->addWidget(row1);
     row1->setSpacing( KDialog::spacingHint() );
     edit=new TQPushButton(i18n("Edit Current..."),row1);
     create=new TQPushButton(i18n("Create New..."),row1);
     open=new TQPushButton(i18n("Open Existing..."),row1);
 
     KSeparator *separator1 = new KSeparator(back);
-    layout->addWidget(separator1);
+    tqlayout->addWidget(separator1);
 
     l = new TQLabel( i18n( "Merging:" ),back );
-    layout->addWidget(l);
-//  l->setMaximumHeight( l->sizeHint().height() );
+    tqlayout->addWidget(l);
+//  l->setMaximumHeight( l->tqsizeHint().height() );
     TQHBox *row2=new TQHBox(back);
-    layout->addWidget(row2);
+    tqlayout->addWidget(row2);
     row2->setSpacing( KDialog::spacingHint() );
     preview=new TQPushButton(i18n("Print Preview..."),row2);
     document=new TQPushButton(i18n("Create New Document"),row2);
     document->hide();
     (void) new TQWidget(row2);
-    layout->addStretch();
+    tqlayout->addStretch();
 
     KSeparator *separator2 = new KSeparator(back);
-    layout->addWidget(separator2);
+    tqlayout->addWidget(separator2);
 
     enableDisableEdit();
 
@@ -482,7 +482,7 @@ void KWMailMergeConfigDialog::slotOpenClicked()
 void KWMailMergeConfigDialog::slotPreviewClicked()
 {
     db_->action=KWSLMergePreview;
-    KMainWindow *mw=dynamic_cast<KMainWindow*>(((TQWidget *)parent())->topLevelWidget());
+    KMainWindow *mw=dynamic_cast<KMainWindow*>(((TQWidget *)parent())->tqtopLevelWidget());
     if (mw)
     {
         KAction *ac=mw->actionCollection()->action(KStdAction::stdName(KStdAction::PrintPreview));
@@ -516,11 +516,11 @@ KWMailMergeVariableInsertDia::KWMailMergeVariableInsertDia( TQWidget *parent, KW
   m_db=db;
   TQWidget *page = plainPage();
 
-  TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() );
-  layout->setAutoAdd( true );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() );
+  tqlayout->setAutoAdd( true );
 
   TQLabel *l = new TQLabel( i18n( "Name:" ), page );
-  l->setMaximumHeight( l->sizeHint().height() );
+  l->setMaximumHeight( l->tqsizeHint().height() );
   names = new TQListBox( page );
 
   TQMap< TQString, TQString >::ConstIterator it = db->getRecordEntries().begin();