summaryrefslogtreecommitdiffstats
path: root/tderesources
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:51:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:51:32 -0600
commit0c9d97065a3d6ceb12d687555a1a33d90db96238 (patch)
tree4305105967fc03b06139b57871d5ab6d2360e75b /tderesources
parent59d153016be1e09cb31cdb18bef0a649acfc6292 (diff)
downloadtdelibs-0c9d97065a3d6ceb12d687555a1a33d90db96238.tar.gz
tdelibs-0c9d97065a3d6ceb12d687555a1a33d90db96238.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'tderesources')
-rw-r--r--tderesources/configpage.cpp10
-rw-r--r--tderesources/factory.cpp4
2 files changed, 7 insertions, 7 deletions
diff --git a/tderesources/configpage.cpp b/tderesources/configpage.cpp
index 5844dd97..0660710d 100644
--- a/tderesources/configpage.cpp
+++ b/tderesources/configpage.cpp
@@ -174,17 +174,17 @@ void ConfigPage::load()
// KDE-3.3 compatibility code: get families from the plugins
TQStringList compatFamilyNames;
- const KTrader::OfferList plugins = KTrader::self()->query( "KResources/Plugin" );
- KTrader::OfferList::ConstIterator it = plugins.begin();
- KTrader::OfferList::ConstIterator end = plugins.end();
+ const TDETrader::OfferList plugins = TDETrader::self()->query( "KResources/Plugin" );
+ TDETrader::OfferList::ConstIterator it = plugins.begin();
+ TDETrader::OfferList::ConstIterator end = plugins.end();
for ( ; it != end; ++it ) {
const TQString family = (*it)->property( "X-TDE-ResourceFamily" ).toString();
if ( compatFamilyNames.find( family ) == compatFamilyNames.end() )
compatFamilyNames.append( family );
}
- const KTrader::OfferList managers = KTrader::self()->query( "KResources/Manager" );
- KTrader::OfferList::ConstIterator m_it;
+ const TDETrader::OfferList managers = TDETrader::self()->query( "KResources/Manager" );
+ TDETrader::OfferList::ConstIterator m_it;
for( m_it = managers.begin(); m_it != managers.end(); ++m_it ) {
TQString displayName = (*m_it)->property( "Name" ).toString();
familyDisplayNames.append( displayName );
diff --git a/tderesources/factory.cpp b/tderesources/factory.cpp
index ea19e3b8..09140e7b 100644
--- a/tderesources/factory.cpp
+++ b/tderesources/factory.cpp
@@ -58,9 +58,9 @@ Factory *Factory::self( const TQString& resourceFamily )
Factory::Factory( const TQString& resourceFamily ) :
mResourceFamily( resourceFamily )
{
- KTrader::OfferList plugins = KTrader::self()->query( "KResources/Plugin", TQString( "[X-TDE-ResourceFamily] == '%1'" )
+ TDETrader::OfferList plugins = TDETrader::self()->query( "KResources/Plugin", TQString( "[X-TDE-ResourceFamily] == '%1'" )
.arg( resourceFamily ) );
- KTrader::OfferList::ConstIterator it;
+ TDETrader::OfferList::ConstIterator it;
for ( it = plugins.begin(); it != plugins.end(); ++it ) {
TQVariant type = (*it)->property( "X-TDE-ResourceType" );
if ( !type.toString().isEmpty() )