Rename old tq methods that no longer need a unique name

1 files changed, 14 insertions, 14 deletions

diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp
index e477f502..ee4b919f 100644
--- a/kword/KWMailMergeDataBase.cpp
+++ b/kword/KWMailMergeDataBase.cpp
@@ -60,7 +60,7 @@ KWMailMergeDataBase::KWMailMergeDataBase( KWDocument *doc_ )
 TQStringList KWMailMergeDataBase::availablePlugins()
 {
     TQStringList tmp;
-    KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::tqfromLatin1("KWord/MailMergePlugin"),TQString());
+    KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("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::tqfromLatin1("KWord/MailMergePlugin"),constrain);
+    KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain);
     KService::Ptr it=pluginOffers.first();
 
     TQVariant verProp=it->property("X-KDE-PluginVersion");
@@ -118,7 +118,7 @@ KWMailMergeDataSource *KWMailMergeDataBase::openPluginFor(int type,int &version)
     KWMailMergeDataSource *ret=0;
     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::tqfromLatin1("KWord/MailMergePlugin"),constrain);
+    KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain);
 
     //Only for debugging
     for (KTrader::OfferList::Iterator it=pluginOffers.begin();*it;++it)
@@ -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::tqfromLatin1("PLUGIN"));
+        TQDomElement el=doc.createElement(TQString::fromLatin1("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::tqfromLatin1("DATASOURCE"));
+        TQDomElement el2=doc.createElement(TQString::fromLatin1("DATASOURCE"));
         plugin->save(doc,el2);
         parentElem.appendChild(el2);
 
@@ -336,18 +336,18 @@ KWMailMergeChoosePluginDialog::KWMailMergeChoosePluginDialog( KTrader::OfferList
   label->setBuddy( chooser );
   descriptionLabel = new TQLabel( back );
   descriptionLabel->hide();
-  descriptionLabel->tqsetAlignment( WordBreak );
+  descriptionLabel->setAlignment( WordBreak );
   descriptionLabel->setFrameShape( TQFrame::Box );
   descriptionLabel->setFrameShadow( TQFrame::Sunken );
 
-  TQSize old_tqsizeHint;
+  TQSize old_sizeHint;
   for ( KTrader::OfferList::Iterator it = pluginOffers.begin(); *it; ++it )
   {
     chooser->insertItem( (*it)->name() );
-    old_tqsizeHint = descriptionLabel->tqsizeHint();
+    old_sizeHint = descriptionLabel->sizeHint();
     descriptionLabel->setText( (*it)->comment() );
-    if (descriptionLabel->tqsizeHint().width()*descriptionLabel->tqsizeHint().height() > old_tqsizeHint.width()*old_tqsizeHint.height())
-        descriptionLabel->setMinimumSize(descriptionLabel->tqsizeHint() );
+    if (descriptionLabel->sizeHint().width()*descriptionLabel->sizeHint().height() > old_sizeHint.width()*old_sizeHint.height())
+        descriptionLabel->setMinimumSize(descriptionLabel->sizeHint() );
   }
   descriptionLabel->show();
 
@@ -395,7 +395,7 @@ KWMailMergeConfigDialog::KWMailMergeConfigDialog(TQWidget *parent,KWMailMergeDat
 //    row1->setSpacing( KDialog::spacingHint() );
 
     TQLabel *l = new TQLabel( i18n( "Datasource:" ),back );
-//    l->setMaximumHeight( l->tqsizeHint().height() );
+//    l->setMaximumHeight( l->sizeHint().height() );
     tqlayout->addWidget(l);
 
     TQHBox *row1=new TQHBox(back);
@@ -410,7 +410,7 @@ KWMailMergeConfigDialog::KWMailMergeConfigDialog(TQWidget *parent,KWMailMergeDat
 
     l = new TQLabel( i18n( "Merging:" ),back );
     tqlayout->addWidget(l);
-//  l->setMaximumHeight( l->tqsizeHint().height() );
+//  l->setMaximumHeight( l->sizeHint().height() );
     TQHBox *row2=new TQHBox(back);
     tqlayout->addWidget(row2);
     row2->setSpacing( KDialog::spacingHint() );
@@ -482,7 +482,7 @@ void KWMailMergeConfigDialog::slotOpenClicked()
 void KWMailMergeConfigDialog::slotPreviewClicked()
 {
     db_->action=KWSLMergePreview;
-    KMainWindow *mw=dynamic_cast<KMainWindow*>(((TQWidget *)parent())->tqtopLevelWidget());
+    KMainWindow *mw=dynamic_cast<KMainWindow*>(((TQWidget *)parent())->topLevelWidget());
     if (mw)
     {
         KAction *ac=mw->actionCollection()->action(KStdAction::stdName(KStdAction::PrintPreview));
@@ -520,7 +520,7 @@ KWMailMergeVariableInsertDia::KWMailMergeVariableInsertDia( TQWidget *parent, KW
   tqlayout->setAutoAdd( true );
 
   TQLabel *l = new TQLabel( i18n( "Name:" ), page );
-  l->setMaximumHeight( l->tqsizeHint().height() );
+  l->setMaximumHeight( l->sizeHint().height() );
   names = new TQListBox( page );
 
   TQMap< TQString, TQString >::ConstIterator it = db->getRecordEntries().begin();