diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:42:26 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:42:26 -0600 |
| commit | 786304c6211f35ddc4cdd54b7aa7985fef4a2e70 (patch) | |
| tree | c881806a53e2864b7e183f4930f0b20abf657c38 /kword/KWMailMergeDataBase.cpp | |
| parent | 0dda6e85e171acf1a73dc8d3d1f67b4fcc9b1ae7 (diff) | |
| download | koffice-786304c6211f35ddc4cdd54b7aa7985fef4a2e70.tar.gz koffice-786304c6211f35ddc4cdd54b7aa7985fef4a2e70.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'kword/KWMailMergeDataBase.cpp')
| -rw-r--r-- | kword/KWMailMergeDataBase.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp index 7303f1db..08ec69d4 100644 --- a/kword/KWMailMergeDataBase.cpp +++ b/kword/KWMailMergeDataBase.cpp @@ -60,8 +60,8 @@ KWMailMergeDataBase::KWMailMergeDataBase( KWDocument *doc_ ) TQStringList KWMailMergeDataBase::availablePlugins() { TQStringList tmp; - KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),TQString()); - for (KTrader::OfferList::Iterator it=pluginOffers.begin();*it;++it) + TDETrader::OfferList pluginOffers=TDETrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),TQString()); + for (TDETrader::OfferList::Iterator it=pluginOffers.begin();*it;++it) { tmp.append((*it)->property("X-TDE-InternalName").toString()); kdDebug()<<"Found mail merge plugin: "<< (*it)->name()<<endl; @@ -79,7 +79,7 @@ bool KWMailMergeDataBase::loadPlugin(const TQString &name,const TQString &comman if (rejectdcopcall)return false; TQString constrain=TQString("[X-TDE-InternalName] =='"+name+"'"); kdDebug()<<constrain<<endl; - KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain); + TDETrader::OfferList pluginOffers=TDETrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain); KService::Ptr it=pluginOffers.first(); TQVariant verProp=it->property("X-TDE-PluginVersion"); @@ -118,10 +118,10 @@ KWMailMergeDataSource *KWMailMergeDataBase::openPluginFor(int type,int &version) KWMailMergeDataSource *ret=0; TQString constrain=TQString("'%1' in [X-TDE-Capabilities]").arg(((type==KWSLCreate)?KWSLCreate_text:KWSLOpen_text)); kdDebug()<<constrain<<endl; - KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain); + TDETrader::OfferList pluginOffers=TDETrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain); //Only for debugging - for (KTrader::OfferList::Iterator it=pluginOffers.begin();*it;++it) + for (TDETrader::OfferList::Iterator it=pluginOffers.begin();*it;++it) { kdDebug()<<"Found mail merge plugin: "<< (*it)->name()<<endl; } @@ -324,7 +324,7 @@ int KWMailMergeDataBase::version() { * ******************************************************************/ -KWMailMergeChoosePluginDialog::KWMailMergeChoosePluginDialog( KTrader::OfferList offers ) +KWMailMergeChoosePluginDialog::KWMailMergeChoosePluginDialog( TDETrader::OfferList offers ) : KDialogBase( Plain, i18n( "Mail Merge Setup" ), Ok | Cancel, Ok, /*parent*/ 0, "", true ), pluginOffers( offers ) { @@ -341,7 +341,7 @@ KWMailMergeChoosePluginDialog::KWMailMergeChoosePluginDialog( KTrader::OfferList descriptionLabel->setFrameShadow( TQFrame::Sunken ); TQSize old_sizeHint; - for ( KTrader::OfferList::Iterator it = pluginOffers.begin(); *it; ++it ) + for ( TDETrader::OfferList::Iterator it = pluginOffers.begin(); *it; ++it ) { chooser->insertItem( (*it)->name() ); old_sizeHint = descriptionLabel->sizeHint(); |