From da1941ccadffe5ae70ee111c53f0ec2b3d990869 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 10:53:25 -0600 Subject: Rename KLock and KTrader to avoid conflicts with KDE4 --- src/plugincontroller.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/plugincontroller.cpp') diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp index 22014efe..d490e097 100644 --- a/src/plugincontroller.cpp +++ b/src/plugincontroller.cpp @@ -49,8 +49,8 @@ namespace template ComponentType *loadDefaultPart( const TQString &serviceType ) { - KTrader::OfferList offers = KTrader::self()->query(serviceType, TQString("[X-TDevelop-Version] == %1").arg(TDEVELOP_PLUGIN_VERSION)); - KTrader::OfferList::ConstIterator serviceIt = offers.begin(); + TDETrader::OfferList offers = TDETrader::self()->query(serviceType, TQString("[X-TDevelop-Version] == %1").arg(TDEVELOP_PLUGIN_VERSION)); + TDETrader::OfferList::ConstIterator serviceIt = offers.begin(); for ( ; serviceIt != offers.end(); ++serviceIt ) { KService::Ptr service = *serviceIt; @@ -119,27 +119,27 @@ PluginController::~PluginController() void PluginController::loadCorePlugins() { - KTrader::OfferList coreOffers = m_engine.offers(m_profile, ProfileEngine::Core); + TDETrader::OfferList coreOffers = m_engine.offers(m_profile, ProfileEngine::Core); loadPlugins( coreOffers ); } void PluginController::loadGlobalPlugins( const TQStringList & ignorePlugins ) { - KTrader::OfferList globalOffers = m_engine.offers(m_profile, ProfileEngine::Global); + TDETrader::OfferList globalOffers = m_engine.offers(m_profile, ProfileEngine::Global); loadPlugins( globalOffers, ignorePlugins ); } void PluginController::loadProjectPlugins( const TQStringList & ignorePlugins ) { - KTrader::OfferList projectOffers = m_engine.offers(m_profile, ProfileEngine::Project); + TDETrader::OfferList projectOffers = m_engine.offers(m_profile, ProfileEngine::Project); loadPlugins( projectOffers, ignorePlugins ); } -void PluginController::loadPlugins( KTrader::OfferList offers, const TQStringList & ignorePlugins ) +void PluginController::loadPlugins( TDETrader::OfferList offers, const TQStringList & ignorePlugins ) { TopLevel::getInstance()->main()->setFocus(); - for (KTrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it) + for (TDETrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it) { TQString name = (*it)->desktopEntryName(); @@ -173,10 +173,10 @@ void PluginController::unloadProjectPlugins( ) { // this is nasty, but we need to unload the version control plugin too, and the // right moment to do this is here - KTrader::OfferList offers = KTrader::self()->query("TDevelop/VersionControl", ""); + TDETrader::OfferList offers = TDETrader::self()->query("TDevelop/VersionControl", ""); offers += m_engine.offers(m_profile, ProfileEngine::Project); - for (KTrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it) + for (TDETrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it) { TQString name = (*it)->desktopEntryName(); @@ -281,8 +281,8 @@ const TQValueList PluginController::loadedPlugins() KDevPlugin * PluginController::extension( const TQString & serviceType, const TQString & constraint ) { - KTrader::OfferList offers = KDevPluginController::query(serviceType, constraint); - for (KTrader::OfferList::const_iterator it = offers.constBegin(); it != offers.end(); ++it) + TDETrader::OfferList offers = KDevPluginController::query(serviceType, constraint); + for (TDETrader::OfferList::const_iterator it = offers.constBegin(); it != offers.end(); ++it) { KDevPlugin *ext = m_parts[(*it)->desktopEntryName()]; if (ext) return ext; @@ -292,10 +292,10 @@ KDevPlugin * PluginController::extension( const TQString & serviceType, const TQ KDevPlugin * PluginController::loadPlugin( const TQString & serviceType, const TQString & constraint ) { - KTrader::OfferList offers = KDevPluginController::query( serviceType, constraint ); + TDETrader::OfferList offers = KDevPluginController::query( serviceType, constraint ); if ( !offers.size() == 1 ) return 0; - KTrader::OfferList::const_iterator it = offers.constBegin(); + TDETrader::OfferList::const_iterator it = offers.constBegin(); TQString name = (*it)->desktopEntryName(); KDevPlugin * plugin = 0; @@ -334,8 +334,8 @@ TQString PluginController::changeProfile(const TQString &newProfile) { kdDebug() << "CHANGING PROFILE: from " << currentProfile() << " to " << newProfile << endl; TQStringList unload; - KTrader::OfferList coreLoad; - KTrader::OfferList globalLoad; + TDETrader::OfferList coreLoad; + TDETrader::OfferList globalLoad; m_engine.diffProfiles(ProfileEngine::Core, currentProfile(), newProfile, unload, coreLoad); m_engine.diffProfiles(ProfileEngine::Global, currentProfile(), newProfile, unload, globalLoad); -- cgit v1.2.1