diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 10:51:32 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 10:51:32 -0600 |
commit | 0c9d97065a3d6ceb12d687555a1a33d90db96238 (patch) | |
tree | 4305105967fc03b06139b57871d5ab6d2360e75b /tdehtml/tdehtml_part.cpp | |
parent | 59d153016be1e09cb31cdb18bef0a649acfc6292 (diff) | |
download | tdelibs-0c9d97065a3d6ceb12d687555a1a33d90db96238.tar.gz tdelibs-0c9d97065a3d6ceb12d687555a1a33d90db96238.zip |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'tdehtml/tdehtml_part.cpp')
-rw-r--r-- | tdehtml/tdehtml_part.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp index b74984aaf..059763c6a 100644 --- a/tdehtml/tdehtml_part.cpp +++ b/tdehtml/tdehtml_part.cpp @@ -4652,20 +4652,20 @@ KParts::ReadOnlyPart *TDEHTMLPart::createPart( TQWidget *parentWidget, const cha if ( !serviceName.isEmpty() ) constr.append( TQString::fromLatin1( "Name == '%1'" ).arg( serviceName ) ); - KTrader::OfferList offers = KTrader::self()->query( mimetype, "KParts/ReadOnlyPart", constr, TQString() ); + TDETrader::OfferList offers = TDETrader::self()->query( mimetype, "KParts/ReadOnlyPart", constr, TQString() ); if ( offers.isEmpty() ) { int pos = mimetype.find( "-plugin" ); if (pos < 0) return 0L; TQString stripped_mime = mimetype.left( pos ); - offers = KTrader::self()->query( stripped_mime, "KParts/ReadOnlyPart", constr, TQString() ); + offers = TDETrader::self()->query( stripped_mime, "KParts/ReadOnlyPart", constr, TQString() ); if ( offers.isEmpty() ) return 0L; } - KTrader::OfferList::ConstIterator it = offers.begin(); - const KTrader::OfferList::ConstIterator itEnd = offers.end(); + TDETrader::OfferList::ConstIterator it = offers.begin(); + const TDETrader::OfferList::ConstIterator itEnd = offers.end(); for ( ; it != itEnd; ++it ) { KService::Ptr service = (*it); |