summaryrefslogtreecommitdiffstats
path: root/src/profileengine/lib
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:53:25 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:53:25 -0600
commitda1941ccadffe5ae70ee111c53f0ec2b3d990869 (patch)
treeee683f46b49e6abdbdef78ed45ca65b47538bc23 /src/profileengine/lib
parent054f5901ab09f6ea6235bd12fbd167922fdf0f67 (diff)
downloadtdevelop-da1941ccadffe5ae70ee111c53f0ec2b3d990869.tar.gz
tdevelop-da1941ccadffe5ae70ee111c53f0ec2b3d990869.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'src/profileengine/lib')
-rw-r--r--src/profileengine/lib/profileengine.cpp26
-rw-r--r--src/profileengine/lib/profileengine.h6
2 files changed, 16 insertions, 16 deletions
diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp
index 78df6789..e811740c 100644
--- a/src/profileengine/lib/profileengine.cpp
+++ b/src/profileengine/lib/profileengine.cpp
@@ -69,14 +69,14 @@ void ProfileEngine::processDir(const TQString &dir, const TQString &currPath, TQ
}
}
-KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType offerType)
+TDETrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType offerType)
{
ProfileListing listing;
Profile *profile = 0;
getProfileWithListing(listing, &profile, profileName);
if (!profile)
- return KTrader::OfferList();
+ return TDETrader::OfferList();
TQString constraint = TQString::fromLatin1("[X-TDevelop-Version] == %1").arg(TDEVELOP_PLUGIN_VERSION);
switch (offerType) {
@@ -106,12 +106,12 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
<< " " << constraint << endl << endl << endl;*/
//END debug
- KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("TDevelop/Plugin"), constraint);
+ TDETrader::OfferList list = TDETrader::self()->query(TQString::fromLatin1("TDevelop/Plugin"), constraint);
TQStringList names;
/* Wrong, this is not what we want to do.
Profile::EntryList disableList = profile->list(Profile::ExplicitDisable);
- KTrader::OfferList::iterator it = list.begin();
+ TDETrader::OfferList::iterator it = list.begin();
while (it != list.end())
{
TQString name = (*it)->desktopEntryName();
@@ -131,7 +131,7 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
continue;
TQString constraint = TQString::fromLatin1("[X-TDevelop-Version] == %1").arg(TDEVELOP_PLUGIN_VERSION);
constraint += TQString::fromLatin1("and [Name] == '%1'").arg((*it).name);
- KTrader::OfferList enable = KTrader::self()->query(TQString::fromLatin1("TDevelop/Plugin"), constraint);
+ TDETrader::OfferList enable = TDETrader::self()->query(TQString::fromLatin1("TDevelop/Plugin"), constraint);
list += enable;
}
@@ -139,7 +139,7 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
kdDebug() << "=============" << endl
<< " =============" << endl
<< " ============= Plugins for Profile:" << endl;
- for (KTrader::OfferList::const_iterator it = list.begin(); it != list.end(); ++it)
+ for (TDETrader::OfferList::const_iterator it = list.begin(); it != list.end(); ++it)
kdDebug() << " " << (*it)->name() << endl;
kdDebug() << endl << endl;
//END debug*/
@@ -147,7 +147,7 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
return list;
}
-KTrader::OfferList ProfileEngine::allOffers(OfferType offerType)
+TDETrader::OfferList ProfileEngine::allOffers(OfferType offerType)
{
TQString constraint = TQString::fromLatin1("[X-TDevelop-Version] == %1").arg(TDEVELOP_PLUGIN_VERSION);
switch (offerType) {
@@ -161,7 +161,7 @@ KTrader::OfferList ProfileEngine::allOffers(OfferType offerType)
constraint += TQString::fromLatin1(" and [X-TDevelop-Scope] == 'Core'");
break;
}
- return KTrader::self()->query(TQString::fromLatin1("TDevelop/Plugin"), constraint);
+ return TDETrader::self()->query(TQString::fromLatin1("TDevelop/Plugin"), constraint);
}
void ProfileEngine::getProfileWithListing(ProfileListing &listing, Profile **profile,
@@ -208,17 +208,17 @@ KURL::List ProfileEngine::resourcesRecursive(const TQString &profileName, const
}
void ProfileEngine::diffProfiles(OfferType offerType, const TQString &profile1,
- const TQString &profile2, TQStringList &unload, KTrader::OfferList &load)
+ const TQString &profile2, TQStringList &unload, TDETrader::OfferList &load)
{
- KTrader::OfferList offers1 = offers(profile1, offerType);
- KTrader::OfferList offers2 = offers(profile2, offerType);
+ TDETrader::OfferList offers1 = offers(profile1, offerType);
+ TDETrader::OfferList offers2 = offers(profile2, offerType);
TQStringList offers1List;
- for (KTrader::OfferList::const_iterator it = offers1.constBegin();
+ for (TDETrader::OfferList::const_iterator it = offers1.constBegin();
it != offers1.constEnd(); ++it)
offers1List.append((*it)->desktopEntryName());
TQMap<TQString, KService::Ptr> offers2List;
- for (KTrader::OfferList::const_iterator it = offers2.constBegin();
+ for (TDETrader::OfferList::const_iterator it = offers2.constBegin();
it != offers2.constEnd(); ++it)
offers2List[(*it)->desktopEntryName()] = *it;
diff --git a/src/profileengine/lib/profileengine.h b/src/profileengine/lib/profileengine.h
index eb32a8fa..4ea93bdf 100644
--- a/src/profileengine/lib/profileengine.h
+++ b/src/profileengine/lib/profileengine.h
@@ -100,9 +100,9 @@ public:
};
/**@return The list of plugin offers for given profile and type.*/
- KTrader::OfferList offers(const TQString &profileName, OfferType offerType);
+ TDETrader::OfferList offers(const TQString &profileName, OfferType offerType);
/**@return The list of all plugin offers for given type.*/
- KTrader::OfferList allOffers(OfferType offerType);
+ TDETrader::OfferList allOffers(OfferType offerType);
/**@return The list of URLs to the resources (files) with given @p extension.
@param profileName A name of a profile to find resources in.
@@ -135,7 +135,7 @@ public:
@note Resulting lists are not cleared. Pass only clean lists in the
common case.*/
void diffProfiles(OfferType offerType, const TQString &profile1, const TQString &profile2,
- TQStringList &unload, KTrader::OfferList &load);
+ TQStringList &unload, TDETrader::OfferList &load);
/**@return The root profile. Root profile is always named "KDevelop" and it
defines an empty list of plugins. Applications built on KDevelop platform