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 /lib/kofficecore | |
| parent | 0dda6e85e171acf1a73dc8d3d1f67b4fcc9b1ae7 (diff) | |
| download | koffice-786304c6211f35ddc4cdd54b7aa7985fef4a2e70.tar.gz koffice-786304c6211f35ddc4cdd54b7aa7985fef4a2e70.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'lib/kofficecore')
| -rw-r--r-- | lib/kofficecore/KoQueryTrader.cpp | 10 | ||||
| -rw-r--r-- | lib/kofficecore/KoQueryTrader.h | 2 | ||||
| -rw-r--r-- | lib/kofficecore/KoSpeaker.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/kofficecore/KoQueryTrader.cpp b/lib/kofficecore/KoQueryTrader.cpp index 54699ca1..9c4620d1 100644 --- a/lib/kofficecore/KoQueryTrader.cpp +++ b/lib/kofficecore/KoQueryTrader.cpp @@ -31,7 +31,7 @@ #include <limits.h> // UINT_MAX /** - * Port from KOffice Trader to KTrader/KActivator (kded) by Simon Hausmann + * Port from KOffice Trader to TDETrader/KActivator (kded) by Simon Hausmann * (c) 1999 Simon Hausmann <hausmann@kde.org> * Port to KService and simplifications by David Faure <faure@kde.org> */ @@ -123,9 +123,9 @@ TQValueList<KoDocumentEntry> KoDocumentEntry::query( bool _onlyDocEmb, const TQS constr += " exist Library"; // Query the trader - KTrader::OfferList offers = KTrader::self()->query( "KOfficePart", constr ); + TDETrader::OfferList offers = TDETrader::self()->query( "KOfficePart", constr ); - KTrader::OfferList::ConstIterator it = offers.begin(); + TDETrader::OfferList::ConstIterator it = offers.begin(); unsigned int max = offers.count(); for( unsigned int i = 0; i < max; i++, ++it ) { @@ -174,9 +174,9 @@ TQValueList<KoFilterEntry::Ptr> KoFilterEntry::query( const TQString & _constr ) kdDebug(30500) << "KoFilterEntry::query( " << _constr << " )" << endl; TQValueList<KoFilterEntry::Ptr> lst; - KTrader::OfferList offers = KTrader::self()->query( "KOfficeFilter", _constr ); + TDETrader::OfferList offers = TDETrader::self()->query( "KOfficeFilter", _constr ); - KTrader::OfferList::ConstIterator it = offers.begin(); + TDETrader::OfferList::ConstIterator it = offers.begin(); unsigned int max = offers.count(); //kdDebug(30500) << "Query returned " << max << " offers" << endl; for( unsigned int i = 0; i < max; i++ ) diff --git a/lib/kofficecore/KoQueryTrader.h b/lib/kofficecore/KoQueryTrader.h index e7afc23a..511bd918 100644 --- a/lib/kofficecore/KoQueryTrader.h +++ b/lib/kofficecore/KoQueryTrader.h @@ -76,7 +76,7 @@ public: * This function will query tdesycoca to find all available components. * The result will only contain parts, which are embeddable into a document * - * @param _constr is a constraint expression as used by KTrader. + * @param _constr is a constraint expression as used by TDETrader. * You can use it to set additional restrictions on the available * components. */ diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp index 4599927b..f0e163e0 100644 --- a/lib/kofficecore/KoSpeaker.cpp +++ b/lib/kofficecore/KoSpeaker.cpp @@ -475,7 +475,7 @@ bool KoSpeaker::sayWidget(const TQString& msg) /*static*/ bool KoSpeaker::isKttsdInstalled() { - KTrader::OfferList offers = KTrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'"); + TDETrader::OfferList offers = TDETrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'"); return (offers.count() > 0); } |